diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-01-15 21:23:21 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-03-12 13:16:26 +0100 |
| commit | f07d4d077e2cc133c1d33edf668c9533789f2b0a (patch) | |
| tree | 95701bf7262f01ae5c28950b3fc1787b5fcbb375 /pkgs/top-level/release-haskell.nix | |
| parent | f2032fa12b9143fc1ae8dd64c530e725fa013e0b (diff) | |
haskell.compiler.ghc961: init at 9.6.1
xhtml seems to be built unconditionally now which is at least one thing improved by hadrian.
Diffstat (limited to 'pkgs/top-level/release-haskell.nix')
| -rw-r--r-- | pkgs/top-level/release-haskell.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index c9be9cc460067..ef4b2ef71bc3e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -346,19 +346,26 @@ let }; }; - # TODO(@sternenseemann): when GHC 9.6 comes out we need separate jobs for - # default GHC and ghcHEAD. - pkgsCross.ghcjs.haskellPackages = + pkgsCross.ghcjs = removePlatforms [ # Hydra output size of 3GB is exceeded "aarch64-linux" ] { - inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) - ghc - hello - ; + haskellPackages = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) + ghc + hello + ; + }; + + haskell.packages.ghcHEAD = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) + ghc + hello + ; + }; }; }) (versionedCompilerJobs { |