diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-08-19 10:28:41 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-08-23 14:35:12 +0000 |
| commit | 3be693ee0cbccd7288abb16b78e10dd28e7cb8b1 (patch) | |
| tree | 700ad3ee1f1eb57ee96435832e7aae5acb587ded | |
| parent | Merge #187517: staging-next-22.05 - iteration 8 (diff) | |
| download | nixpkgs-origin/backport-187418-to-release-22.05.tar.gz | |
gcc12: 12.1.0 -> 12.2.0origin/backport-187418-to-release-22.05
Co-authored-by: Robert Scott <github@humanleg.org.uk>
(cherry picked from commit 657075f9fa5993602d7b881c0e1247e143c50302)
| -rw-r--r-- | pkgs/development/compilers/gcc/12/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 5ee6d51bb3ba..6a90ecdfc10f 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -52,7 +52,7 @@ with lib; with builtins; let majorVersion = "12"; - version = "${majorVersion}.1.0"; + version = "${majorVersion}.2.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -65,8 +65,11 @@ let majorVersion = "12"; ../gcc-12-gfortran-driving.patch ../ppc-musl.patch ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { - url = "https://github.com/Homebrew/formula-patches/raw/76677f2b/gcc/gcc-12.1.0-arm.diff"; - sha256 = "sha256-IcCYHSCAElJqTAZELJnRRWo0/SlkgQzSvoMjYr3pgD0="; + # TODO: switch back to Homebrew patches: + # was "https://github.com/Homebrew/formula-patches/raw/76677f2b/gcc/gcc-12.1.0-arm.diff" + name = "gcc-12-darwin-aarch64-support.patch"; + url = "https://github.com/tjni/gcc-12-branch/compare/releases/gcc-12.2...gcc-12-2-darwin.diff"; + sha256 = "sha256-hjM9q6tsdzoGOQWJ7v3BaeVxdWQGTaEnep2ZSwX5+74="; }) # Obtain latest patch with ../update-mcfgthread-patches.sh @@ -87,7 +90,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "sha256-Yv1jSInzHAK2SvLEaPBktHrRynhBHEWr5qxLX43RnHs="; + sha256 = "sha256-5UnPnPNZSgDie2WJ1DItcOByDN0hPzm+tBgeBpJiMP8="; }; inherit patches; |