diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-06-21 16:41:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-06-21 16:41:58 +0200 |
| commit | ac8741e0ea4212e24bc692a4cda7478cd076bc16 (patch) | |
| tree | 3c9e8e8695b38d881e058fb2ad9d83548c798309 /pkgs/development | |
| parent | a735413be673e26edde9a6dabedaa62797d34154 (diff) | |
| parent | 61e5bba2b7239d15719700603ffc04f11ecaf36e (diff) | |
Merge #235728: gcc11: 11.3.0 -> 11.4.0
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/gcc/11/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 8513f03d2da18..4169081269754 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -50,7 +50,7 @@ with lib; with builtins; let majorVersion = "11"; - version = "${majorVersion}.3.0"; + version = "${majorVersion}.4.0"; disableBootstrap = !stdenv.hostPlatform.isDarwin; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -58,7 +58,6 @@ let majorVersion = "11"; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch - ./fix-struct-redefinition-on-glibc-2.36.patch ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch @@ -75,9 +74,9 @@ let majorVersion = "11"; ++ optionals stdenv.isDarwin [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. - # 2d280e7 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.3.0 - url = "https://github.com/iains/gcc-11-branch/compare/2d280e7eafc086e9df85f50ed1a6526d6a3a204d..gcc-11.3-darwin-r2.diff"; - sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg="; + # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0 + url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; + hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; }) ] # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 @@ -167,7 +166,7 @@ lib.pipe (stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk="; + hash = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; }; inherit patches; |