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: 3b056514a731
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0c1b8e877013
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 30, 2018

  1. gcc6: 6.4.0 -> 6.5.0 

    http://lists.gnu.org/archive/html/info-gnu/2018-10/msg00003.html
    @dtzWill
    dtzWill committed Oct 30, 2018
    Copy the full SHA
    d2e7840 View commit details

  2. gcc6: don't apply patches included in update to 6.5

    @dtzWill
    dtzWill committed Oct 30, 2018
    Copy the full SHA
    00a51a9 View commit details

Commits on Nov 2, 2018

  1. Merge pull request #49455 from dtzWill/update/gcc-6.5 

    gcc6: 6.4.0 -> 6.5.0
    @dtzWill
    dtzWill authored Nov 2, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0c1b8e8 View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −4 pkgs/development/compilers/gcc/6/default.nix
6 changes: 2 additions & 4 deletions pkgs/development/compilers/gcc/6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;

let version = "6.4.0";
let version = "6.5.0";

inherit (stdenv) buildPlatform hostPlatform targetPlatform;

@@ -57,8 +57,6 @@ let version = "6.4.0";
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
;

@@ -168,7 +166,7 @@ stdenv.mkDerivation ({

src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5";
sha256 = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby";
};

inherit patches;