pyrox.dev
lol
Merge #235728: gcc11: 11.3.0 -> 11.4.0
+5
-6
pkgs/development/compilers/gcc/11/default.nix
+5
-6
pkgs/development/compilers/gcc/11/default.nix
···
50
with builtins;
51
52
let majorVersion = "11";
53
-
version = "${majorVersion}.3.0";
54
disableBootstrap = !stdenv.hostPlatform.isDarwin;
55
56
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
···
58
patches = [
59
# Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
60
../fix-bug-80431.patch
61
-
./fix-struct-redefinition-on-glibc-2.36.patch
62
../install-info-files-serially.patch
63
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
64
++ optional noSysDirs ../no-sys-dirs.patch
···
75
++ optionals stdenv.isDarwin [
76
(fetchpatch {
77
# There are no upstream release tags in https://github.com/iains/gcc-11-branch.
78
-
# 2d280e7 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.3.0
79
-
url = "https://github.com/iains/gcc-11-branch/compare/2d280e7eafc086e9df85f50ed1a6526d6a3a204d..gcc-11.3-darwin-r2.diff";
80
-
sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg=";
81
})
82
]
83
# https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808
···
167
168
src = fetchurl {
169
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
170
-
sha256 = "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk=";
171
};
172
173
inherit patches;
···
50
with builtins;
51
52
let majorVersion = "11";
53
+
version = "${majorVersion}.4.0";
54
disableBootstrap = !stdenv.hostPlatform.isDarwin;
55
56
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
···
58
patches = [
59
# Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
60
../fix-bug-80431.patch
61
../install-info-files-serially.patch
62
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
63
++ optional noSysDirs ../no-sys-dirs.patch
···
74
++ optionals stdenv.isDarwin [
75
(fetchpatch {
76
# There are no upstream release tags in https://github.com/iains/gcc-11-branch.
77
+
# ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0
78
+
url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff";
79
+
hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4=";
80
})
81
]
82
# https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808
···
166
167
src = fetchurl {
168
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
169
+
hash = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk=";
170
};
171
172
inherit patches;