From 02eb6d057194cd9670bfe669617161d9e7736f5a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 Jun 2025 09:08:50 +0100 Subject: [PATCH 1/2] gcc13: 13.3.0 -> 13.4.0 Changes: https://sourceware.org/pipermail/gcc/2025-June/246131.html --- pkgs/development/compilers/gcc/patches/default.nix | 6 ++---- pkgs/development/compilers/gcc/versions.nix | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 9a55332ade9b..0b57ecab691f 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -245,11 +245,9 @@ in "13" = [ (fetchpatch { name = "gcc-13-darwin-aarch64-support.patch"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff"; - sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo="; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/698885df7f624d0ce15bceb79a4d9760a473b502/gcc/gcc-13.4.0.diff"; + hash = "sha256-xqkBDFYZ6fdowtqR3kV7bR8a4Cu11RDokSzGn1k3a1w="; }) - # Needed to build LLVM>18 - ./cfi_startproc-reorder-label-2.diff ]; # Patches from https://github.com/iains/gcc-12-branch/compare/2bada4bc59bed4be34fab463bdb3c3ebfd2b41bb..gcc-12-4-darwin "12" = [ diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index 63921abef84d..e47a4160f8ba 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -2,7 +2,7 @@ let majorMinorToVersionMap = { "15" = "15.1.0"; "14" = "14.3.0"; - "13" = "13.3.0"; + "13" = "13.4.0"; "12" = "12.4.0"; "11" = "11.5.0"; "10" = "10.5.0"; @@ -19,7 +19,7 @@ let # 4 digits: snapshots (14.2.1.20250322) "15.1.0" = "sha256-4rCewhZg8B/s/7cV4BICZSFpQ/A40OSKmGhxPlTwbOo="; "14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo="; - "13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM="; + "13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU="; "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU="; "11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg="; "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; From 8cdb0f159a3c368c3aa729c642944f4b2be70c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 3 Aug 2025 10:29:06 +0200 Subject: [PATCH 2/2] gnat13Packages.gnatprove: fixup build after gcc13 update --- pkgs/development/ada-modules/gnatprove/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index ae4ef6fa930d..18772e8cac6d 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -52,6 +52,10 @@ let hash = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI="; }; commit_date = "2023-01-05"; + patches = [ + # Changes to the GNAT frontend: https://github.com/AdaCore/spark2014/issues/58 + ./0003-Adjust-after-category-change-for-N_Formal_Package_De.patch + ]; }; "14" = { src = fetchSpark2014 {