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..17b8263295737 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -428,38 +428,9 @@ 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 = { - 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 [