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
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, perl, flex }:

 stdenv.mkDerivation rec {
-  name = "bison-3.0";
+  name = "bison-3.0.2";

  src = fetchurl {
    url = "mirror://gnu/bison/${name}.tar.gz";
-    sha256 = "1ll22hcfslyl9n3pgvvphzdp18w9cyic8m0qimfnb8mrs1syrdz5";
+    sha256 = "1vc17y6242jlwp0gdj7wsim3nvc1ws7q3j0v3065nz8g9hd9vwnd";
  };

  nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optionals doCheck [ flex ];