Updating from trunk. I only had to take away the usual stdenv2 in

all-packages.nix


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

pkgs/tools/networking/p2p/seeks/default.nix

@@ -1,23 +1,20 @@
 { fetchurl, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl
-, autoconf, automake, libtool }:
+, pkgconfig, protobuf, tokyocabinet }:
 
-let version = "0.2.3a"; in
+let version = "0.3.0"; in
 stdenv.mkDerivation {
   name = "seeks-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/seeks/solo/seeks_solo_stable-${version}.src.tar.gz";
-    sha256 = "0hjaqwcaa19qbq28y5gq0415fz10vx034aghqa01hrhhl9yrjvc4";
+    url = "mirror://sourceforge/seeks/solo/seeks-${version}.tar.gz";
+    sha256 = "07gkf7666bx5fk3zk0s47fj659czlyk3ag9bihkl5mdjfikb6k46";
   };
 
   buildInputs =
-    [ zlib docbook2x pcre curl libxml2 libevent perl
-      autoconf automake libtool
+    [ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig
+      protobuf tokyocabinet
     ];
 
-  # The tarball doesn't contain `configure' & co.  Sigh...
-  preConfigure = "autoreconf -vfi";
-
   configureFlags =
     [ # Enable the built-in web server providing a web search interface.
       # See <http://www.seeks-project.info/wiki/index.php/Seeks_On_Web>.

pkgs/tools/networking/pdsh/default.nix

@@ -1,11 +1,12 @@
 {stdenv, fetchurl, perl, readline, rsh, ssh, pam}:
 
 stdenv.mkDerivation rec {
-  name = "pdsh-2.18";
+  name = "pdsh-2.22";
   src = fetchurl {
     url = "mirror://sourceforge/pdsh/${name}.tar.bz2";
-    sha256 = "8c94acb17b4af8a9f553db180b4d5745c9c98844a5dc070e2ce80590e8e8a539";
+    sha256 = "1b3c5dbaa8nhw2a5h89khs501m6ywg3zfzv7zahgsvjc8zcnfg8q";
   };
+
   buildInputs = [perl readline ssh pam];
 
   /* pdsh uses pthread_cancel(), which requires libgcc_s.so.1 to be
@@ -39,6 +40,16 @@ stdenv.mkDerivation rec {
     homepage = "https://computing.llnl.gov/linux/pdsh.html";
     description = "A high-performance, parallel remote shell utility.";
     license = "GPLv2";
+
+    longDescription = ''
+      Pdsh is a high-performance, parallel remote shell utility. It has
+      built-in, thread-safe clients for Berkeley and Kerberos V4 rsh and
+      can call SSH externally (though with reduced performance). Pdsh
+      uses a "sliding window" parallel algorithm to conserve socket
+      resources on the initiating node and to allow progress to continue
+      while timeouts occur on some connections.
+    '';
+
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };