Merge remote-tracking branch 'origin/glibc-2.18'

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/;
   };
 }

pkgs/tools/text/source-highlight/default.nix

@@ -8,21 +8,23 @@ stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-      url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
-      sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1";
-    };
+    url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
+    sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1";
+  };
 
   configureFlags = [ "--with-boost=${boost}" ];
 
-  buildInputs = [boost];
+  buildInputs = [ boost ];
+
+  enableParallelBuilding = false;
+
   doCheck = true;
 
   meta = {
-    description = "source code renderer with syntax highlighting";
-    homepage = "http://www.gnu.org/software/src-highlite/";
+    description = "Source code renderer with syntax highlighting";
+    homepage = http://www.gnu.org/software/src-highlite/;
     license = "GPLv3+";
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     longDescription =
       ''
         GNU Source-highlight, given a source file, produces a document