From 9d1343414a2032f41dc6799ed46b27a5caaddc14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 31 Dec 2015 10:34:58 +0100 Subject: [PATCH] gcc: switch back to 4.9 Also sync a tiny difference in docs outputs from gcc-5. I originally assumed that people will push gcc-5 support to master long before closure-size gets there, but I overestimated the situation. We haven't really settled even the issue of ABI switch, so let's use the same gcc version on closure-size and master. --- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 2b87c8ac430..15cff141070 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation ({ inherit patches; - outputs = [ "out" "lib" "doc" ]; + outputs = [ "out" "lib" "man" "info" ]; setOutputFlags = false; NIX_NO_SELF_RPATH = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6c75b8a619..e3957a6d95b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3865,7 +3865,7 @@ let gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc5; + gcc = gcc49; gcc_multi = if system == "x86_64-linux" then lowPrio (