diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-11 00:23:03 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-11 00:23:03 +0200 |
| commit | 4970574409ea15bcd769c4e999e8d272ae629b1b (patch) | |
| tree | d53877f04b3ad18dd6edfe3569fc14bc94a95b14 /pkgs/stdenv/linux | |
| parent | 4a57b07653751be95636134aee91586c47aedb4c (diff) | |
| parent | d57ef6b523838cf161dbc9fb01173caf3e84954b (diff) | |
| download | nixlib-4970574409ea15bcd769c4e999e8d272ae629b1b.tar nixlib-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.gz nixlib-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.bz2 nixlib-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.lz nixlib-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.xz nixlib-4970574409ea15bcd769c4e999e8d272ae629b1b.tar.zst nixlib-4970574409ea15bcd769c4e999e8d272ae629b1b.zip | |
Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts: pkgs/development/libraries/wayland/default.nix
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 722d40bf7fbe..861b7930b71e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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: { |