* Another sync with the trunk.

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

pkgs/tools/networking/pdsh/default.nix

@@ -18,7 +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")
+                 + " " + (if rsh == false then "--without-rsh" else "--with-rsh")
                  + " --with-dshgroups"
                  + " --with-xcpu"
                  + " --without-genders"

pkgs/tools/networking/wget/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext}:
+{stdenv, fetchurl, gettext, openssl ? null}:
 
 stdenv.mkDerivation rec {
   name = "wget-1.11.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1yr7w182n7lvkajvq07wnw65sw2vmxjkc3611kpc728vhvi54zwb";
   };
 
-  buildInputs = [gettext];
+  buildInputs = [gettext openssl];
 
   meta = {
     description = "A console downloading program. Has some features for mirroring sites.";