diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index d01991784977d..78a313916dbc4 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -57,7 +57,7 @@ Available compilers are collected under `haskell.compiler`. Each of those compiler versions has a corresponding attribute set `packages` built with it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC -9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias +9.4.8 is `haskell.packages.ghc948`. In fact `haskellPackages` (at the time of writing) is just an alias for `haskell.packages.ghc966`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. diff --git a/pkgs/development/compilers/ghc/9.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix deleted file mode 100644 index cffbfef1524eb..0000000000000 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -import ./common-make-native-bignum.nix { - version = "9.4.5"; - sha256 = "6256cf9caf6d6dc7b611dcfbb247df2d528e85aa39d22a698e870e5a590e8601"; -} diff --git a/pkgs/development/compilers/ghc/9.4.6.nix b/pkgs/development/compilers/ghc/9.4.6.nix deleted file mode 100644 index 0d37ba97fdb60..0000000000000 --- a/pkgs/development/compilers/ghc/9.4.6.nix +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -import ./common-make-native-bignum.nix { - version = "9.4.6"; - sha256 = "1b705cf52692f9d4d6707cdf8e761590f5f56ec8ea6a65e36610db392d3d24b9"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ececbd86ee3ef..a199263055f31 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -174,56 +174,6 @@ in { llvmPackages = pkgs.llvmPackages_12; }; ghc92 = compiler.ghc928; - ghc945 = callPackage ../development/compilers/ghc/9.4.5.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - - # On ARM text won't build with GHC 8.10.* - if stdenv.buildPlatform.isAarch then - # TODO(@sternenseemann): package bindist - bb.packages.ghc902 - # No suitable bindists for powerpc64le - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc902 - else - bb.packages.ghc8107Binary; - inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 - python3 = buildPackages.python311; # so that we don't have two of them - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; - ghc946 = callPackage ../development/compilers/ghc/9.4.6.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround where possible to keep bootstrap path short. - - # On ARM text won't build with GHC 8.10.* - if stdenv.buildPlatform.isAarch then - # TODO(@sternenseemann): package bindist - bb.packages.ghc902 - # No suitable bindists for powerpc64le - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc902 - else - bb.packages.ghc8107Binary; - inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 - python3 = buildPackages.python311; # so that we don't have two of them - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; ghc947 = callPackage ../development/compilers/ghc/9.4.7.nix { bootPkgs = # Building with 9.2 is broken due to @@ -532,16 +482,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; ghc92 = packages.ghc928; - ghc945 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc945; - ghc = bh.compiler.ghc945; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; - ghc946 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc946; - ghc = bh.compiler.ghc946; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; ghc947 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc947; ghc = bh.compiler.ghc947; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 8633444fb9f31..10ad3f27fb047 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -65,8 +65,6 @@ let ghc926 ghc927 ghc928 - ghc945 - ghc946 ghc947 ghc948 ghc963 @@ -555,8 +553,6 @@ let compilerNames.ghc926 compilerNames.ghc927 compilerNames.ghc928 - compilerNames.ghc945 - compilerNames.ghc946 compilerNames.ghc947 compilerNames.ghc948 compilerNames.ghc9101