From 12ebd346e5e53a0c7e5fe74448a343fb4a219551 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 21 Jan 2026 12:14:30 +0100 Subject: [PATCH] haskell.compiler.ghc9123: Don't apply backported ppc64 ELFv1 patch --- .../compilers/ghc/common-hadrian.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index e744c50817600..669e4841618a0 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -262,13 +262,19 @@ "sha256-vtjT+TL/7sYPu4rcVV3xCqJQ+uqkyBbf9l0KIi97j/0="; }) ] - ++ lib.optionals (lib.versionOlder version "9.14.1") [ - (fetchpatch { - name = "ghc-rts-Fix-compile-on-powerpc64-elf-v1.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/05e5785a3157c71e327a8e9bdc80fa7082918739.patch"; - hash = "sha256-xP5v3cKhXeTRSFvRiKEn9hPxGXgVgykjTILKjh/pdDU="; - }) - ] + ++ + lib.optionals + ( + (lib.versions.majorMinor version == "9.12" && lib.versionOlder version "9.12.3") + || (lib.versions.majorMinor version != "9.12" && lib.versionOlder version "9.14.1") + ) + [ + (fetchpatch { + name = "ghc-rts-Fix-compile-on-powerpc64-elf-v1.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/05e5785a3157c71e327a8e9bdc80fa7082918739.patch"; + hash = "sha256-xP5v3cKhXeTRSFvRiKEn9hPxGXgVgykjTILKjh/pdDU="; + }) + ] # Fix build with gcc15 # https://gitlab.haskell.org/ghc/ghc/-/issues/25662 # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13863