Updating from trunk.

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

pkgs/tools/misc/detox/default.nix

@@ -0,0 +1,24 @@
+{stdenv, fetchurl, flex}:
+
+stdenv.mkDerivation {
+  name = "detox-1.2.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz;
+    sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45";
+  };
+
+  buildInputs = [flex];
+
+  meta = {
+    description = "Detox is a 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
+      equivalents. It will also clean up filenames with UTF-8 or Latin-1
+      (or CP-1252) characters in them.
+    '';
+    homepage = "http://detox.sourceforge.net/";
+    license = "bsd";
+  };
+}

pkgs/tools/misc/grub/default.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}:
 
 stdenv.mkDerivation {
-  name = "grub-0.97-patch-1.9";
+  name = "grub-0.97-patch-1.10";
   
   src = fetchurl {
     url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   # failures on systems with more than 2 GiB RAM, and for booting from
   # ext3 filesystems with 256-byte inodes as well as ext4 filesystems.
   gentooPatches = fetchurl {
-    url = mirror://gentoo/distfiles/grub-0.97-patches-1.9.tar.bz2;
-    sha256 = "0a20bi2njqdgi0993g9dzjcn9vjzlisp9ghw0dcz00q84v4lb13b";
+    url = mirror://gentoo/distfiles/grub-0.97-patches-1.10.tar.bz2;
+    sha256 = "015hkmb2jd6jfzkfr13cdh16frvva04rwr4yahzyw5xhl634d1h9";
   };
 
   patches = [

pkgs/tools/misc/minicom/default.nix

@@ -1,18 +1,32 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "minicom-2.3";
-  
+  name = "minicom-2.4";
+
   src = fetchurl {
-    url = "http://alioth.debian.org/frs/download.php/2332/${name}.tar.gz";
-    sha256 = "1ysn0crdhvwyvdlbw0ms5nq06xy2pd2glwjs53p384byl3ac7jra";
+    url = "http://alioth.debian.org/frs/download.php/3195/${name}.tar.gz";
+    sha256 = "0j0ayimh3389pciqs60fsfafn87p9gnmmmqz15xq9fkkn10g4ykb";
   };
 
   buildInputs = [ncurses];
-  
-  configureFlags = [ "--sysconfdir=/etc" ];
+
+  configureFlags = [ "--sysconfdir=/etc" "--enable-lock-dir=/var/lock" ];
+
+  preConfigure =
+    # Have `configure' assume that the lock directory exists.
+    '' sed -i "configure" -e's/test -d \$UUCPLOCK/true/g'
+    '';
 
   meta = {
-    description = "Serial console";
+    description = "Minicom, a modem control and terminal emulation program";
+    homepage = http://alioth.debian.org/projects/minicom/;
+
+    longDescription =
+      '' Minicom is a menu driven communications program.  It emulates ANSI
+         and VT102 terminals.  It has a dialing directory and auto zmodem
+         download.
+      '';
+
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

pkgs/tools/misc/parallel/default.nix

@@ -1,15 +1,17 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20100722";
+  name = "parallel-20100906";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1dq2icd6xigi4pf66178pdim6dmpw7vkfndwady5r93kymz7m399";
+    sha256 = "1h27ffq0hk2dlnffsk377lpp65l2zmvija7r831lpvdfssklmxvw";
   };
 
   patchPhase =
     '' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
+
+       rm -vf src/sem
     '';
 
   buildInputs = [ perl ];

pkgs/tools/misc/psmisc/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "psmisc-22.7";
+  name = "psmisc-22.12";
   
   src = fetchurl {
     url = "mirror://sourceforge/psmisc/${name}.tar.gz";
-    sha256 = "1b8xs4sqf8wljbxn7y1nqdf8mgbn0d2yip93jbz8lyak6d68g704";
+    sha256 = "0ykak6gf835xj0wksqbw2rjny958prayhm2fv6r3fqfs06jl2bxs";
   };
   
   buildInputs = [ncurses];
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://psmisc.sourceforge.net/;
     description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/misc/syslog-ng/default.nix

@@ -1,16 +1,22 @@
 {stdenv, fetchurl, eventlog, pkgconfig, glib}:
 
-stdenv.mkDerivation rec {
-  name = "syslog-ng-2.1.3";
+stdenv.mkDerivation {
+  name = "syslog-ng-3.1.2";
+
+  src = fetchurl {
+    url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.1.2/source/syslog-ng_3.1.2.tar.gz";
+    sha256 = "0a508l4j11336jn5kg65l70rf7xbpdxi2n477rvp5p48cc1adcg2";
+  };
+
+  buildInputs = [eventlog pkgconfig glib];
+  configureFlags = "--enable-dynamic-linking";
+
   meta = {
     homepage = "http://www.balabit.com/network-security/syslog-ng/";
     description = "Next-generation syslogd with advanced networking and filtering capabilities.";
     license = "GPLv2";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
-  src = fetchurl {
-    url = "http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/${name}.tar.gz";
-    sha256 = "1m6djxhmihmg09a90gg6mp1ghgk2zm8rcp04shh458433rbzfjb0";
-  };
-  buildInputs = [eventlog pkgconfig glib];
-  configureFlags = "--enable-dynamic-linking";
 }

pkgs/tools/misc/system-config-printer/default.nix

@@ -1,15 +1,20 @@
-{stdenv, fetchurl, perl, perlXMLParser, desktop_file_utils}:
+{stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto,
+  docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}:
+
+stdenv.mkDerivation rec {
+  name = "${meta.name}-${meta.version}";
 
-stdenv.mkDerivation {
-  name = "system-config-printer-0.9.93";
   src = fetchurl {
-    url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2;
-    md5 = "b97deae648bc1c5825874d250a9c140c";
+    url = "http://cyberelk.net/tim/data/${meta.name}/1.2/${name}.tar.bz2";
+    sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww";
+  };
+  buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412
+    libxml2 docbook_xsl desktop_file_utils libusb cups];
+
+  configureFlags = "--with-udev-rules";
+
+  meta = {
+    name = "system-config-printer";
+    version = "1.2.4";
   };
-  preConfigure = ''
-    sed -i -e "s/xmlto/echo xmlto/" Makefile.in # Disable building manual pages
-    echo > man/system-config-printer.1
-    echo > man/system-config-printer-applet.1
-  ''; 
-  buildInputs = [ perl perlXMLParser desktop_file_utils ];
 }

pkgs/tools/misc/uucp/default.nix

@@ -1,14 +1,30 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "uucp-1.07";
 
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz;
+    url = "mirror://gnu/uucp/${name}.tar.gz";
     sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306";
   };
 
+  doCheck = true;
+
   meta = {
     description = "Unix-unix cp over serial line, also includes cu program";
+
+    longDescription =
+      '' Taylor UUCP is a free implementation of UUCP and is the standard
+         UUCP used on the GNU system.  If you don't know what UUCP is chances
+         are, nowadays, that you won't need it.  If you do need it, you've
+         just found one of the finest UUCP implementations available.
+      '';
+
+    homepage = http://www.gnu.org/software/uucp/uucp.html;
+
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }