From ba03cc765707fbc9a004ec78d51d195e56a2e817 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 3 Dec 2025 20:22:12 +0100
Subject: [PATCH 1/2] pkgsStatic.haskellPackages.ghc: 9.4 -> 9.12

We recently merged changes to build TemplateHaskell with iserv-proxy,
which allows us to bump pkgsStatic from GHC 9.4 to GHC 9.8+. Currently,
GHC 9.10 is the default, but it fails some builds with TH (for example
`pkgsStatic.haskell.packages.native-bignum.ghc910.jose`), which succeed
with GHC 9.12.

Resolves #275304
---
 pkgs/top-level/all-packages.nix    | 5 ++---
 pkgs/top-level/release-haskell.nix | 9 ---------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb80334a36b6a..ffafc77deffd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4778,10 +4778,9 @@ with pkgs;
 
   haskellPackages = recurseIntoAttrs (
     # Prefer native-bignum to avoid linking issues with gmp;
-    # TemplateHaskell doesn't work with hadrian built GHCs yet
-    # https://github.com/NixOS/nixpkgs/issues/275304
+    # GHC 9.10 doesn't work too well with iserv-proxy.
     if stdenv.hostPlatform.isStatic then
-      haskell.packages.native-bignum.ghc94
+      haskell.packages.native-bignum.ghc912
     # JS backend can't use gmp
     else if stdenv.hostPlatform.isGhcjs then
       haskell.packages.native-bignum.ghc910
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 4ebe579617621..ad6b4ec94f2be 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -428,15 +428,6 @@ let
                 postgrest
                 ;
             };
-
-            haskell.packages.native-bignum.ghc9103 = {
-              inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc9103)
-                hello
-                random
-                QuickCheck
-                terminfo # isn't bundled for cross
-                ;
-            };
           };
 
       pkgsCross = {

From 99b063263c4c589e4c9cf130b3d7cfb2c856e901 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 14 Dec 2025 13:56:30 +0100
Subject: [PATCH 2/2] release-haskell: remove
 pkgsCross.aarch64-android-prebuilt.pkgsStatic

Nesting pkgsCross.pkgsStatic doesn't work properly for android-prebuilt,
it will result in a build with musl.
---
 pkgs/top-level/release-haskell.nix | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index ad6b4ec94f2be..17b8263295737 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -431,26 +431,6 @@ let
           };
 
       pkgsCross = {
-        aarch64-android-prebuilt.pkgsStatic =
-          removePlatforms
-            [
-              # Android NDK package doesn't support building on
-              "aarch64-darwin"
-              "aarch64-linux"
-
-              "x86_64-darwin"
-            ]
-            {
-              haskell.packages.ghc912 = {
-                inherit
-                  (packagePlatforms pkgs.pkgsCross.aarch64-android-prebuilt.pkgsStatic.haskell.packages.ghc912)
-                  ghc
-                  hello
-                  microlens
-                  ;
-              };
-            };
-
         ghcjs =
           removePlatforms
             [