Revert "pkgsMusl.haskell.compiler.*: use python38 to unbreak build"

This reverts commit 36628e6e04e22a8b72ea5a07e4973670acabfca9.

As it turns out this wasn't caused by the update from python 3.8 -> 3.9,
but the underlying issue affects both python version (it seems that LTO
is at fault currently). Will have to be fixed elsewhere, reverting.

1 files changed, 8 insertions, 14 deletions

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e6a54f0e52d..86a09b4a1fa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -39,12 +39,6 @@ let
   # Use this rather than `rec { ... }` below for sake of overlays.
   inherit (pkgs.haskell) compiler packages;
 
-  # temporarily use python 3.8 since 3.9 fails with musl
-  # https://github.com/NixOS/nixpkgs/issues/131557
-  muslArgs = pkgs.lib.optionalAttrs pkgs.stdenv.buildPlatform.isMusl {
-    python3 = buildPackages.python38;
-  };
-
 in {
   lib = haskellLib;
 
@@ -63,7 +57,7 @@ in {
       minimal = true;
     };
 
-    ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix ({
+    ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
       # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
       # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
       bootPkgs = if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then
@@ -73,8 +67,8 @@ in {
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_7;
       llvmPackages = pkgs.llvmPackages_7;
-    } // muslArgs);
-    ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix ({
+    };
+    ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix {
       # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
       # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
       bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then
@@ -84,8 +78,8 @@ in {
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_9;
       llvmPackages = pkgs.llvmPackages_9;
-    } // muslArgs);
-    ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix ({
+    };
+    ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
       # aarch64 ghc8102Binary exceeds max output size on hydra
       bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
           packages.ghc8102BinaryMinimal
@@ -94,14 +88,14 @@ in {
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_10;
       llvmPackages = pkgs.llvmPackages_10;
-    } // muslArgs);
-    ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({
+    };
+    ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs = packages.ghc901; # no binary yet
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_10;
       llvmPackages = pkgs.llvmPackages_10;
       libffi = pkgs.libffi;
-    } // muslArgs);
+    };
 
     # The integer-simple attribute set contains all the GHC compilers
     # build with integer-simple instead of integer-gmp.