diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2024-02-26 17:16:15 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2024-02-26 17:19:02 +0100 |
| commit | 2d02d0d463358f591657d8b9904f4adfe9c69d2f (patch) | |
| tree | 6b7d5f8d1da5108066c40d85936ce84c860220a0 /pkgs | |
| parent | 4eb8d82934810c8ac35a05c3f0d5298fcf85d585 (diff) | |
| download | nixlib-2d02d0d463358f591657d8b9904f4adfe9c69d2f.tar nixlib-2d02d0d463358f591657d8b9904f4adfe9c69d2f.tar.gz nixlib-2d02d0d463358f591657d8b9904f4adfe9c69d2f.tar.bz2 nixlib-2d02d0d463358f591657d8b9904f4adfe9c69d2f.tar.lz nixlib-2d02d0d463358f591657d8b9904f4adfe9c69d2f.tar.xz nixlib-2d02d0d463358f591657d8b9904f4adfe9c69d2f.tar.zst nixlib-2d02d0d463358f591657d8b9904f4adfe9c69d2f.zip | |
haskell.compiler.ghc982: fix bootstrap with GHC 9.6
Bootsrapping with 9.6 doesn't work with 9.8.2 upstream due to erroneous bounds on Cabal (<https://gitlab.haskell.org/ghc/ghc/-/issues/24100>) which was planned to be addressed in 9.8.2, but apparently hasn't been, so we need to extend the range for the workaround patch.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/haskell/hadrian/hadrian.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/haskell/hadrian/hadrian.nix b/pkgs/development/tools/haskell/hadrian/hadrian.nix index 2fda57ac1aeb..7a44e2eeffc2 100644 --- a/pkgs/development/tools/haskell/hadrian/hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -23,7 +23,7 @@ mkDerivation { ''; patches = lib.optionals (!enableHyperlinkedSource) [ ./disable-hyperlinked-source.patch - ] ++ lib.optionals (ghcVersion == "9.8.1") [ + ] ++ lib.optionals (lib.elem ghcVersion [ "9.8.1" "9.8.2" ]) [ # Incorrect bounds on Cabal # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 ./hadrian-9.8.1-allow-Cabal-3.10.patch diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 09fba3269575..9b6784240bfa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -317,7 +317,7 @@ in { else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc963 else - packages.ghc948; + packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and |