diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-15 15:55:39 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-15 15:55:39 +0000 |
commit | e9ad76a2ffe6c6fa4b63287b86c2bb4ebee9807b (patch) | |
tree | 5b27e05270bdf0300afa126318c3c4346fb78c80 /pkgs/os-specific | |
parent | c0e9630d98610ede2d729e27555e36182bf5f593 (diff) |
* Upstart updated to 0.6.5.
* Added libnih (a dependency of Upstart). * Removed the old Upstart 0.3.x. svn path=/nixpkgs/trunk/; revision=20015
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/upstart/0.6.nix | 40 | ||||
-rw-r--r-- | pkgs/os-specific/linux/upstart/default.nix | 27 |
2 files changed, 12 insertions, 55 deletions
diff --git a/pkgs/os-specific/linux/upstart/0.6.nix b/pkgs/os-specific/linux/upstart/0.6.nix deleted file mode 100644 index 2dff6c899b544..0000000000000 --- a/pkgs/os-specific/linux/upstart/0.6.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, expat }: - -stdenv.mkDerivation rec { - name = "upstart-0.6.3"; - - src = fetchurl { - url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.bz2"; - sha256 = "0m472fxd466ycm3l1hnkhi7dlyk1w9q42b7b1j9y1zq5nz6cnf42"; - }; - - 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"; - }; -} diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 466fa277ef34e..b29e6629ff09e 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -1,22 +1,21 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, pkgconfig, dbus, libnih }: -stdenv.mkDerivation { - name = "upstart-0.3.0"; +stdenv.mkDerivation rec { + name = "upstart-0.6.5"; src = fetchurl { - url = http://nixos.org/tarballs/upstart-0.3.0.tar.bz2; - md5 = "269046f41c6418225306280044a799eb"; + url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.gz"; + sha256 = "1kyj2xqvcn9pww3cm5i18svl7ark4a4dbqnm3hiclp4z1jwr01lw"; }; - dontDisableStatic = true; + buildInputs = [ pkgconfig dbus libnih ]; - configureFlags = "--enable-compat"; - - patches = [./cfgdir.patch]; - - preBuild = + NIX_CFLAGS_COMPILE = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DSHELL=\"$SHELL\"" + -DSHELL="${stdenv.shell}" + -DCONFFILE="/etc/init.conf" + -DCONFDIR="/etc/init" + -DPATH="/no-path" ''; # The interface version prevents NixOS from switching to an @@ -25,9 +24,7 @@ stdenv.mkDerivation { # 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 = 1; - }; + passthru.interfaceVersion = 2; postInstall = '' |