Merged with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=10145

pkgs/tools/misc/file/default.nix

@@ -1,9 +1,14 @@
 {stdenv, fetchurl}:
  
 stdenv.mkDerivation {
-  name = "file-4.17";
+  name = "file-4.23";
   src = fetchurl {
-    url = ftp://ftp.astron.com/pub/file/file-4.17.tar.gz;
-    md5 = "50919c65e0181423d66bb25d7fe7b0fd";
+    url = ftp://ftp.astron.com/pub/file/file-4.23.tar.gz;
+    sha256 = "0iyiyzcs88k6r881l11zrg86ys3rnwjyh1bgx7hnfyjv8zk9db9g";
+  };
+
+  meta = {
+    description = "A program that shows the type of files";
+    homepage = ftp://ftp.astron.com/pub/file;
   };
 }

pkgs/tools/misc/grub/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, autoconf, automake}:
 
 if stdenv.system == "x86_64-linux" then
   abort "Grub doesn't build on x86_64-linux.  You should use the build for i686-linux instead."
@@ -6,8 +6,27 @@ else
 
 stdenv.mkDerivation {
   name = "grub-0.97";
+  
   src = fetchurl {
     url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
     md5 = "cd3f3eb54446be6003156158d51f4884";
   };
+  
+  patches = [
+    # Patch to add primitive splash screen support (not the fancy SUSE gfxmenu stuff).
+    # With this you can set splashimage=foo.xpm.gz in menu.lst to get
+    # a 640x480, 14-colour background.
+    (fetchurl {
+      url = "http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/*checkout*/system/grub-gfx/grub-0.97-graphics.patch?rev=HEAD&cvsroot=AUR&only_with_tag=CURRENT&content-type=text/plain";
+      sha256 = "0m6min9cbj71kvp0kxkxdq8dx2dwm3dj0rd5sjz5xdl13ihaj5hy";
+    })
+  ];
+
+  # Autoconf/automake required for the splashimage patch.
+  buildInputs = [autoconf automake];
+
+  preConfigure = ''
+    autoreconf
+  '';
+  
 }

pkgs/tools/misc/less/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
  
 stdenv.mkDerivation {
-  name = "less-394";
+  name = "less-418";
  
   src = fetchurl {
-    url = http://www.greenwoodsoftware.com/less/less-394.tar.gz;
-    md5 = "a9f072ccefa0d315b325f3e9cdbd4b97";
+    url = http://www.greenwoodsoftware.com/less/less-418.tar.gz;
+    sha256 = "1d03n4wx8y1gmf2m8yawzg6ixmfrixcai5l14p9pj8q13gbgqcpm";
   };
  
   buildInputs = [ncurses];

pkgs/tools/misc/memtest86/default.nix

@@ -0,0 +1,26 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "memtest86+-1.70";
+  
+  src = fetchurl {
+    url = http://www.memtest.org/download/1.70/memtest86+-1.70.tar.gz;
+    sha256 = "1swj4hc764qwb3j80kvvb4qg5maq9dp8pxzy9jkk187jf92j8vfw";
+  };
+
+  preBuild = ''
+    # Really dirty hack to get Memtest to build without needing a Glibc
+    # with 32-bit libraries and headers.
+    if test "$system" = x86_64-linux; then
+        mkdir gnu
+        touch gnu/stubs-32.h
+    fi
+  '';
+  
+  NIX_CFLAGS_COMPILE = "-I.";
+  
+  installPhase = ''
+    ensureDir $out
+    cp memtest.bin $out/
+  '';
+}

pkgs/tools/misc/psmisc/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation {
+  name = "psmisc-22.6";
+  src = fetchurl {
+    url = mirror://sourceforge/psmisc/psmisc-22.6.tar.gz;
+    sha256 = "0qlx4rdcj3igk67gzmdbyy6f54h4c5ya17gw0pkxdcwlgj4q2g51";
+  };
+  buildInputs = [ncurses];
+
+  meta = {
+    homepage = http://psmisc.sourceforge.net/;
+    description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)";
+  };
+}

pkgs/tools/misc/relfs/cvs.2007.12.01.nix

@@ -22,7 +22,9 @@ let build = FullDepEntry ("
 	sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
 	make
 	mkdir -p \$out/bin
-	echo 'dropdb relfs_\$1 ; 
+	echo '
+		createuser -A -D \$1
+		dropdb relfs_\$1 ;
 		rm -rf /tmp/relfs-\$1-tmp;  
 		mkdir /tmp/relfs-\$1-tmp;  
 		USER=\$1 relfs -f -s /tmp/relfs-raskin-tmp  &