* Sync with the trunk once more.

* Turn on everything in Hydra.

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

pkgs/tools/networking/ntp/default.nix

@@ -2,12 +2,12 @@
 
 assert stdenv.isLinux -> libcap != null;
  
-stdenv.mkDerivation {
-  name = "ntp-4.2.4p5";
+stdenv.mkDerivation rec {
+  name = "ntp-4.2.4p6";
   
   src = fetchurl {
-    url = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.4p5.tar.gz;
-    sha256 = "066x8gm55cziyc86ciwdq68y2xqfbbqqh8417nkwd1jmrihfmjvl";
+    url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
+    sha256 = "0rqhcmb9rjdl0hkvxyabnmlrzgvvw2f16k7mi9b4qskwgh340xk4";
   };
   
   configureFlags = ''
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     ${if stdenv.isLinux then "--enable-linuxcaps" else ""}
   '';
   
-  buildInputs = if stdenv.isLinux then [libcap] else [];
+  buildInputs = stdenv.lib.optional stdenv.isLinux libcap;
 
   meta = {
     homepage = http://www.ntp.org/;

pkgs/tools/networking/pdsh/default.nix

@@ -1,7 +1,7 @@
-{stdenv, fetchurl, perl, readline, ssh, pam}:
+{stdenv, fetchurl, perl, readline, rsh, ssh, pam}:
 
 stdenv.mkDerivation rec {
-  name = "pdsh-2.16";
+  name = "pdsh-2.18";
   meta = {
     homepage = "https://computing.llnl.gov/linux/pdsh.html";
     description = "A high-performance, parallel remote shell utility.";
@@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
   };
   src = fetchurl {
     url = "mirror://sourceforge/pdsh/${name}.tar.bz2";
-    sha256 = "8891cd3b175d3075f7c71fa4ee2b077306117ada5dd8c0966caaa3b74eca3a3e";
+    sha256 = "8c94acb17b4af8a9f553db180b4d5745c9c98844a5dc070e2ce80590e8e8a539";
   };
-  patches = [ ./fix-missing-sys-types-h.patch ];
   buildInputs = [perl readline ssh pam];
   # Setting --with-machines=$out in configureFlags doesn't seem to work,
   # so I specify configurePhase instead.
@@ -19,6 +18,7 @@ stdenv.mkDerivation rec {
                  + " " + (if readline == null then "--without-readline" else "--with-readline")
                  + " " + (if ssh == null then "--without-ssh" else "--with-ssh")
                  + " " + (if pam == null then "--without-pam" else "--with-pam")
+                 + " " + (if rsh == null then "--without-rsh" else "--with-rsh")
                  + " --with-dshgroups"
                  + " --with-xcpu"
                  + " --without-genders"

pkgs/tools/networking/pdsh/fix-missing-sys-types-h.patch

@@ -1,11 +0,0 @@
---- pdsh-2.16/src/common/hostlist.h	2008-01-29 18:35:48.000000000 +0100
-+++ pdsh-2.16-patched/src/common/hostlist.h	2008-07-07 21:14:12.000000000 +0200
-@@ -29,6 +29,8 @@
- #ifndef _HOSTLIST_H
- #define _HOSTLIST_H
- 
-+#include <sys/types.h>
-+
- /* Notes:
-  *
-  * If WITH_LSD_FATAL_ERROR_FUNC is defined, the linker will expect to