Author: eelco Date: 2010-06-09 21:48:51 +0000 (Wed, 09 Jun 2010) New Revision: 22203
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22203&view=rev Removed: nixpkgs/trunk/pkgs/os-specific/linux/sysvinit/builder.sh Modified: nixpkgs/trunk/pkgs/os-specific/linux/sysvinit/default.nix Log: * Updated sysvinit to 2.88dsf. Changes: Deleted: nixpkgs/trunk/pkgs/os-specific/linux/sysvinit/builder.sh =================================================================== --- nixpkgs/trunk/pkgs/os-specific/linux/sysvinit/builder.sh 2010-06-09 18:03:00 UTC (rev 22202) +++ nixpkgs/trunk/pkgs/os-specific/linux/sysvinit/builder.sh 2010-06-09 21:48:51 UTC (rev 22203) @@ -1,31 +0,0 @@ -source $stdenv/setup - -makeFlagsArray=(LCRYPT=-lcrypt BIN_OWNER=$(id -u) BIN_GROUP=$(id -g) ROOT=$out) - -preBuild="cd src" - -preInstall() { - substituteInPlace Makefile --replace /usr / - mkdir $out - mkdir $out/bin - mkdir $out/sbin - mkdir $out/include - mkdir $out/share - mkdir $out/share/man - mkdir $out/share/man/man1 - mkdir $out/share/man/man5 - mkdir $out/share/man/man8 -} - -postInstall() { - if test -n "$withoutInitTools"; then - mv $out/sbin/killall5 $out/bin - ln -sf killall5 $out/bin/pidof - rm -rf $out/sbin - rm -rf $out/include - rm -rf $out/share/man/man5 - rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') - fi -} - -genericBuild Modified: nixpkgs/trunk/pkgs/os-specific/linux/sysvinit/default.nix =================================================================== --- nixpkgs/trunk/pkgs/os-specific/linux/sysvinit/default.nix 2010-06-09 18:03:00 UTC (rev 22202) +++ nixpkgs/trunk/pkgs/os-specific/linux/sysvinit/default.nix 2010-06-09 21:48:51 UTC (rev 22203) @@ -1,12 +1,36 @@ -{stdenv, fetchurl, withoutInitTools ? false}: +{ stdenv, fetchurl, withoutInitTools ? false }: +let version = "2.88dsf"; in + stdenv.mkDerivation { - name = if withoutInitTools then "sysvtools-2.86" else "sysvinit-2.86"; - builder = ./builder.sh; + name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; + src = fetchurl { - url = ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz; - sha256 = "1n3rnsynlaw7zyp2q5r7c49yvi1xr3669ick540gz73xw7x9hpq3"; + url = "http://www.very-clever.com/download/nongnu/sysvinit/sysvinit-${version}.tar.bz2";; + sha256 = "068mvzaz808a673zigyaqb63xc8bndh2klk16zi5c83rw70wifv0"; }; - patches = [./sysvinit-2.85-exec.patch]; - inherit withoutInitTools; + + patches = [ ./sysvinit-2.85-exec.patch ]; + + makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man"; + + preInstall = + '' + substituteInPlace src/Makefile --replace /usr / + ''; + + postInstall = stdenv.lib.optionalString withoutInitTools + '' + mv $out/sbin/killall5 $out/bin + ln -sf killall5 $out/bin/pidof + rm -rf $out/sbin + rm -rf $out/include + rm -rf $out/share/man/man5 + rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') + ''; + + meta = { + homepage = http://www.nongnu.org/sysvinit/; + description = "Utilities related to booting and shutdown"; + }; } _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
