Merge glibc-2.18 branch into stdenv-updates

It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)

pkgs/tools/filesystems/jfsrec/default.nix

@@ -1,8 +1,8 @@
 { stdenv, fetchurl, boost }:
 
 stdenv.mkDerivation {
-  name = "jfsrec-pre-svn-7";
-  
+  name = "jfsrec-0-pre-svn-7";
+
   src = fetchurl {
     url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz;
     sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
@@ -14,10 +14,10 @@ stdenv.mkDerivation {
   preConfigure =
     ''
       sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
-      cat src/unicode_to_utf8.cpp
     '';
 
   meta = {
     description = "JFS recovery tool";
+    homepage = http://jfsrec.sourceforge.net/;
   };
 }