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: 974fa94fd812
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bd078c1a313a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 18, 2018

  1. gcc5: remove patch 

    The patch fails to apply & may not be necessary any more. Trying to remove it for now just to see.

Hydra log: https://hydra.nixos.org/build/72726891/nixlog/1

Also see #33722

/cc @copumpkin
    @matthewbauer
    matthewbauer authored May 18, 2018
    1
    Copy the full SHA
    bd078c1 View commit details
Showing with 0 additions and 4 deletions.
  1. +0 −4 pkgs/development/compilers/gcc/5/default.nix
4 changes: 0 additions & 4 deletions pkgs/development/compilers/gcc/5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -62,10 +62,6 @@ let version = "5.5.0";
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch

# This could be applied unconditionally but I don't want to cause a full
# Linux rebuild.
++ optional stdenv.cc.isClang ./libcxx38-and-above.patch
++ optional stdenv.hostPlatform.isMusl (fetchpatch {
url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;
sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";