From da9808fe5cd55c827cbf8019ab4896d1cb8f953e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 9 Feb 2016 23:37:07 +0000
Subject: [PATCH] Revert "Switch to GCC 5"

This reverts commit 729870467a97382e2252defe4ae3b04765b9451b.
---
 pkgs/stdenv/linux/default.nix   | 9 +++++++--
 pkgs/top-level/all-packages.nix | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 573e7139aac..12fc3fed5a5 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -210,9 +210,14 @@ rec {
       gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
+      isl_0_11 = pkgs.isl_0_11.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
+      cloog_0_18_0 = pkgs.cloog_0_18_0.override {
+        stdenv = pkgs.makeStaticLibraries pkgs.stdenv;
+        isl = isl_0_11;
+      };
       gccPlain = pkgs.gcc.cc.override {
-        isl = isl;
+        isl = isl_0_11;
+        cloog = cloog_0_18_0;
       };
     };
     extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2eb7191aeb..6eeefe62b9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3944,7 +3944,7 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc5;
+  gcc = gcc49;
 
   gcc_multi =
     if system == "x86_64-linux" then lowPrio (
@@ -4092,7 +4092,7 @@ let
     cross = null;
     libcCross = if crossSystem != null then libcCross else null;
 
-    isl = isl_0_15;
+    isl = isl_0_14;
   }));
 
   gfortran = if !stdenv.isDarwin then gfortran49