Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 116cce8b5f86
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da5a692fcd56
Choose a head ref
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on May 14, 2018

  1. gcc: reset default to gcc7 on darwin

    @Synthetica9
    Synthetica9 committed May 14, 2018
    Copy the full SHA
    836404d View commit details

  2. gcc8: mark as broken on darwin

    @Synthetica9
    Synthetica9 committed May 14, 2018
    Copy the full SHA
    87fd200 View commit details

Commits on May 15, 2018

  1. gcc8: s/hostPlatform/stdenv/

    @Synthetica9
    Synthetica9 committed May 15, 2018
    Copy the full SHA
    7feb762 View commit details

  2. gcc8: disable test on darwin

    @Synthetica9
    Synthetica9 committed May 15, 2018
    Copy the full SHA
    3ec39da View commit details

  3. 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
    @matthewbauer @Synthetica9
    matthewbauer authored and Synthetica9 committed May 15, 2018
    Copy the full SHA
    68cedc0 View commit details

  4. Merge pull request #40519 from Synthetica9/gcc8-darwin-revert 

    gcc,gcc8: {revert gcc to gcc7, mark gcc8 as broken} on Darwin
    @matthewbauer
    matthewbauer authored May 15, 2018
    Copy the full SHA
    da5a692 View commit details
Showing with 9 additions and 2 deletions.
  1. +3 −0 pkgs/development/compilers/gcc/8/default.nix
  2. +2 −1 pkgs/top-level/all-packages.nix
  3. +4 −1 pkgs/top-level/release.nix
3 changes: 3 additions & 0 deletions pkgs/development/compilers/gcc/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -439,6 +439,9 @@ stdenv.mkDerivation ({
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.darwin;

# See #40038
broken = stdenv.isDarwin;
};
}

3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 stdenv.isDarwin then gcc7 else gcc8;
gcc-unwrapped = gcc.cc;

gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
5 changes: 4 additions & 1 deletion pkgs/top-level/release.nix
View file
Original file line number Diff line number Diff line change
@@ -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
jobs.tests.cc-wrapper-gcc8.x86_64-darwin

# 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