* Upstart 0.6.2.

svn path=/nixpkgs/trunk/; revision=18056

pkgs/os-specific/linux/upstart/0.6.nix

@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, dbus, expat }:
+
+stdenv.mkDerivation rec {
+  name = "upstart-0.6.2";
+  
+  src = fetchurl {
+    url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.bz2";
+    sha256 = "107xg5g2nms8wxr6imnh3ll4cmi784l671rp9dr06cvimcbk2pwj";
+  };
+
+  buildInputs = [ pkgconfig dbus expat ];
+  
+  NIX_CFLAGS_COMPILE =
+    ''
+      -DSHELL="${stdenv.shell}"
+      -DCONFFILE="/etc/init.conf"
+      -DCONFDIR="/etc/init"
+      -DPATH="/no-path"
+    '';
+
+  # The interface version prevents NixOS from switching to an
+  # incompatible Upstart at runtime.  (Switching across reboots is
+  # fine, of course.)  It should be increased whenever Upstart changes
+  # in a backwards-incompatible way.  If the interface version of two
+  # Upstart builds is the same, then we can switch between them at
+  # runtime; otherwise we can't and we need to reboot.
+  passthru.interfaceVersion = 2;
+
+  postInstall =
+    ''
+      t=$out/etc/bash_completion.d
+      ensureDir $t
+      cp ${./upstart-bash-completion} $t/upstart
+    '';
+
+  meta = {
+    homepage = "http://upstart.ubuntu.com/";
+    description = "An event-based replacement for the /sbin/init daemon";
+  };
+}

pkgs/os-specific/linux/upstart/default.nix

@@ -1,8 +1,5 @@
 {stdenv, fetchurl}:
 
-let bashCompletion = ./upstart-bash-completion;
-in
-
 stdenv.mkDerivation {
   name = "upstart-0.3.0";
   
@@ -17,7 +14,10 @@ stdenv.mkDerivation {
   
   patches = [./cfgdir.patch];
   
-  preBuild = "export NIX_CFLAGS_COMPILE=\"$NIX_CFLAGS_COMPILE -DSHELL=\\\"$SHELL\\\"\"";
+  preBuild =
+    ''
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DSHELL=\"$SHELL\""
+    '';
 
   # The interface version prevents NixOS from switching to an
   # incompatible Upstart at runtime.  (Switching across reboots is
@@ -29,10 +29,12 @@ stdenv.mkDerivation {
     interfaceVersion = 1;
   };
 
-  postInstall = ''
+  postInstall =
-    t=$out/etc/bash_completion.d
+    ''
-    ensureDir $t; cp ${bashCompletion} $t/upstart
+      t=$out/etc/bash_completion.d
-  '';
+      ensureDir $t
+      cp ${./upstart-bash-completion} $t/upstart
+    '';
 
   meta = {
     homepage = "http://upstart.ubuntu.com/";

pkgs/top-level/all-packages.nix

@@ -6167,6 +6167,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  upstart06 = import ../os-specific/linux/upstart/0.6.nix {
+    inherit fetchurl stdenv pkgconfig dbus expat;
+  };
+
   upstartJobControl = import ../os-specific/linux/upstart/jobcontrol.nix {
     inherit stdenv;
   };