From 836404df95a653494abd843e56dd639d6e1bfd77 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 14 May 2018 21:27:56 +0200 Subject: [PATCH 1/5] gcc: reset default to gcc7 on darwin --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3aaeb5bad11..0993d59df56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6072,7 +6072,8 @@ with pkgs; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; gccFun = callPackage ../development/compilers/gcc/7; - gcc = gcc8; + # Temporary solution until #40038 is fixed + gcc = if hostPlatform.isDarwin then gcc7 else gcc8; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { From 87fd200b9a66a0dd0d7e01247ed30643d98f31fa Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 14 May 2018 21:28:17 +0200 Subject: [PATCH 2/5] gcc8: mark as broken on darwin --- pkgs/development/compilers/gcc/8/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 2465e6149c0..494f37c25e4 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -439,6 +439,9 @@ stdenv.mkDerivation ({ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ stdenv.lib.platforms.darwin; + + # See #40038 + broken = stdenv.isDarwin; }; } From 7feb762344beca06540d073301ccc5217284ee68 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 15 May 2018 15:39:16 +0200 Subject: [PATCH 3/5] gcc8: s/hostPlatform/stdenv/ --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0993d59df56..5ef4a36181d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6073,7 +6073,7 @@ with pkgs; gccFun = callPackage ../development/compilers/gcc/7; # Temporary solution until #40038 is fixed - gcc = if hostPlatform.isDarwin then gcc7 else gcc8; + gcc = if stdenv.isDarwin then gcc7 else gcc8; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { From 3ec39daf0ecf3c1855c31fff8655868b764afb23 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 15 May 2018 15:39:31 +0200 Subject: [PATCH 4/5] gcc8: disable test on darwin --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5233051cad8..cffb56ab00b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -110,7 +110,7 @@ let jobs.tests.cc-wrapper-gcc7.x86_64-linux jobs.tests.cc-wrapper-gcc7.x86_64-darwin jobs.tests.cc-wrapper-gcc8.x86_64-linux - jobs.tests.cc-wrapper-gcc8.x86_64-darwin + # jobs.tests.cc-wrapper-gcc8.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux From 68cedc0b48c04366b326e8f2eb57b32c65c507a8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 May 2018 20:10:06 -0500 Subject: [PATCH 5/5] release: disable tests.cc-wrapper-gcc8.x86_64-darwin This test is broken because gcc8.x86_64-darwin is broken. Please add the test back in once we have fixed it! Job: https://hydra.nixos.org/job/nixpkgs/trunk/gcc8.x86_64-darwin Issue: #40038 --- pkgs/top-level/release.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cffb56ab00b..efced59ad91 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -110,7 +110,10 @@ let jobs.tests.cc-wrapper-gcc7.x86_64-linux jobs.tests.cc-wrapper-gcc7.x86_64-darwin jobs.tests.cc-wrapper-gcc8.x86_64-linux + + # broken see issue #40038 # jobs.tests.cc-wrapper-gcc8.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux