From 54e68744f19eef35e2f6798de254f7d01c7b160a Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Wed, 1 Jan 2025 08:49:50 +0000 Subject: [PATCH 1/2] givaro: fix gcc-14 build https://github.com/linbox-team/givaro/commit/b0cf33e1d4437530c7e4b3db90b6c80057a7f2f3 --- pkgs/development/libraries/givaro/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 44ef1637443f..b9eaaa96965f 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -31,6 +31,13 @@ stdenv.mkDerivation rec { url = "https://github.com/linbox-team/givaro/commit/a81d44b3b57c275bcb04ab00db79be02561deaa2.patch"; hash = "sha256-sSk+VWffoEjZRTJcHRISLHPyW6yuvI1u8knBOfxNUIE="; }) + # https://github.com/linbox-team/givaro/issues/226 + (fetchpatch { + name = "gcc-14.patch"; + url = "https://github.com/linbox-team/givaro/commit/b0cf33e1d4437530c7e4b3db90b6c80057a7f2f3.patch"; + includes = [ "src/kernel/integer/random-integer.h" ]; + hash = "sha256-b2Q8apP9ueEqIUtibTeP47x6TlroRzLgAxuv5ZM1EUw="; + }) ]; enableParallelBuilding = true; From 63f98d466e679bc763638ffb945d82efb66afe48 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Wed, 1 Jan 2025 00:56:20 -0800 Subject: [PATCH 2/2] givaro: fix clang-19 build https://github.com/linbox-team/givaro/commit/a18baf5227d4f3e81a50850fe98e0d954eaa3ddb --- pkgs/development/libraries/givaro/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index b9eaaa96965f..7bd18824b89d 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { includes = [ "src/kernel/integer/random-integer.h" ]; hash = "sha256-b2Q8apP9ueEqIUtibTeP47x6TlroRzLgAxuv5ZM1EUw="; }) + # https://github.com/linbox-team/givaro/issues/232 + (fetchpatch { + name = "clang-19.patch"; + url = "https://github.com/linbox-team/givaro/commit/a18baf5227d4f3e81a50850fe98e0d954eaa3ddb.patch"; + hash = "sha256-IR0IHhCqbxgtsST30vxM9ak1nGtt0apxcLUQ1kS1DHw="; + }) ]; enableParallelBuilding = true;