Merging from trunk. I solved some trivial merge conflicts.

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

pkgs/tools/misc/hdf5/default.nix

@@ -5,8 +5,8 @@
 stdenv.mkDerivation {
   name = "hdf5";
   src = fetchurl {
-    url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5.tar.gz ;
-    sha256 = "0nykbpxg154akgp6va6fkab7kjvybbvpsr7n7i1l8xxmv3h3hbsa";  			
+    url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5-patch1.tar.gz ;
+    sha256 = "919bb52a08fc5560c49fdc5ebd693b10b1e03eebbf44ad2e142c2e6cfd81f2b0";  			
   };
   buildInputs = [] ;
   

pkgs/tools/misc/rlwrap/default.nix

@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline ];
 
+  # Be high-bit-friendly
+  preBuild = ''
+    sed -i src/readline.c -e "s@[*]p [<] ' '@(*p >= 0) \\&\\& (*p < ' ')@"
+  '';
+
   meta = {
     description = "Readline wrapper for console programs";
     homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/;