Merge remote-tracking branch 'origin/gcc-4.9' into staging

Conflicts: pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
parent 4a57b07653 d57ef6b523
commit 4970574409
28 changed files with 132 additions and 164 deletions
@@ -287,6 +287,7 @@ rec {
      [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
        glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
        paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
+        stage3.pkgs.isl_0_11 stage3.pkgs.cloog_0_18_0
      ];

    overrides = pkgs: {