Skip to content

Commit

Permalink
haskell.compiler.ghc94{5,6}: remove at 9.4.5 and 9.4.6, respectively
Browse files Browse the repository at this point in the history
Both are affected by <https://gitlab.haskell.org/ghc/ghc/-/issues/23762>
which is now cropping up on our CI (for Cabal 3.14). I don't really see
why we absolutely have to keep them, so it seems just better overall to
use this as an excuse to remove them (after NixOS 24.11 branch off).
  • Loading branch information
sternenseemann committed Dec 7, 2024
1 parent d5caa1b commit 95c179f
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 77 deletions.
2 changes: 1 addition & 1 deletion doc/languages-frameworks/haskell.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
6 changes: 0 additions & 6 deletions pkgs/development/compilers/ghc/9.4.5.nix

This file was deleted.

6 changes: 0 additions & 6 deletions pkgs/development/compilers/ghc/9.4.6.nix

This file was deleted.

60 changes: 0 additions & 60 deletions pkgs/top-level/haskell-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions pkgs/top-level/release-haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ let
ghc926
ghc927
ghc928
ghc945
ghc946
ghc947
ghc948
ghc963
Expand Down Expand Up @@ -555,8 +553,6 @@ let
compilerNames.ghc926
compilerNames.ghc927
compilerNames.ghc928
compilerNames.ghc945
compilerNames.ghc946
compilerNames.ghc947
compilerNames.ghc948
compilerNames.ghc9101
Expand Down

0 comments on commit 95c179f

Please sign in to comment.