From e8abd9cc1636f77173b3abdaf18543f3dfbcc052 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 23 Oct 2021 11:45:33 -0700 Subject: [PATCH] gcc11: 11.1.0 -> 11.2.0 The cyclades patch has been applied upstream: * https://github.com/gcc-mirror/gcc/commit/2bf34b9f4e4 --- pkgs/development/compilers/gcc/11/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 850b267441fd..f71f941540c4 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -57,7 +57,7 @@ with lib; with builtins; let majorVersion = "11"; - version = "${majorVersion}.1.0"; + version = "${majorVersion}.2.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -78,9 +78,7 @@ let majorVersion = "11"; }) # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch - - ++ [ ../libsanitizer-no-cyclades.patch ]; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -97,7 +95,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "1pwxrjhsymv90xzh0x42cxfnmhjinf2lnrrf3hj5jq1rm2w6yjjc"; + sha256 = "sha256-0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os="; }; inherit patches;