Merge master into stdenv-updates

Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
parent cb639302df 9f735bdf57
commit e740b565cf
395 changed files with 5580 additions and 3281 deletions
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
-    sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c";
+    sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz";
  };

  buildInputs = [ libxml2 ];