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-28 23:28:30 +01:00
parent cb639302df 9f735bdf57
commit e740b565cf
395 changed files with 5580 additions and 3281 deletions
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -3,7 +3,7 @@
 let

  pname = "icu4c";
-  version = "51.1";
+  version = "52.1";
 in
 stdenv.mkDerivation {
  name = pname + "-" + version;
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
  src = fetchurl {
    url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
      + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "0sv6hgkm92pm27zgjxgk284lcxxbsl0syi40ckw2b7yj7d8sxrc7";
+    sha256 = "14l0kl17nirc34frcybzg0snknaks23abhdxkmsqg3k9sil5wk9g";
  };

  postUnpack = ''