Merge master into stdenv-updates

Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
parent 2848336491 9c1d3bfa9f
commit 0a58b512cb
231 changed files with 2911 additions and 1982 deletions
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libuuid }:

 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.42.8";
+  name = "e2fsprogs-1.42.9";

  src = fetchurl {
    url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97";
+    sha256 = "00i83w22sbyq849as9vmaf2xcx1d06npvriyv8m0z81gx43ar4ig";
  };

  buildInputs = [ pkgconfig libuuid ];