Merge branch 'master' into x-updates

Needed that to fix the tarball.

pkgs/development/tools/gnulib/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "gnulib-0.0-7899-g34f8464";
+  name = "gnulib-0.0-7901-g076ac82";
 
   src = fetchgit {
     url = "http://git.savannah.gnu.org/r/gnulib.git";
-    rev = "34f84640cd015eee3d9aed3b1eddf6f361576890";
-    sha256 = "9267827d6b3f0eb97957eae7851afd4e5ac8aa714a83e3be52e7b660cc27851d";
+    rev = "076ac82d1d7f4df54630f1b4917b3c14f227f032";
+    sha256 = "023q3gqjrs8zdk31d81d3bcv9n5770nns0h5vq31saa5391qbpvn";
   };
 
   buildPhase = ":";

pkgs/development/tools/haskell/cabal2nix/default.nix

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.48";
-  sha256 = "0175bprjisjzs0y1xga1xqcy5jx6xlbrvsw6095j12xvyrvzrggr";
+  version = "1.49";
+  sha256 = "1zrxgaw1lqnnyk4xd0skdc72yq3xfx3vfg1sfgrs3235njraa20i";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

pkgs/development/tools/misc/elfutils/default.nix

@@ -24,9 +24,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [m4 bison flex gettext bzip2];
   buildInputs = [zlib bzip2];
 
+  configureFlags = "--disable-werror";
+
   crossAttrs = {
 
-    /* Having bzip2 will harm, because anything using elfutils 
+    /* Having bzip2 will harm, because anything using elfutils
        as buildInput cross-building, will not be able to run 'bzip2' */
     propagatedBuildInputs = [ zlib.crossDrv ];
 
@@ -64,7 +66,7 @@ stdenv.mkDerivation rec {
       cp version.h $out/include
     '';
   };
-  
+
   dontAddDisableDepTrack = true;
 
   meta = {