haskellPackages.hip: allow more simplifier ticks for GHC >= 9.6

Co-authored-by: Rodney Lorrimar <dev@rodney.id.au>
This commit is contained in:
sternenseemann 2024-01-11 15:22:18 +01:00
parent 146350db3f
commit 4c27ef0738
4 changed files with 18 additions and 2 deletions

View File

@ -167,6 +167,10 @@ self: super: {
# Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327
gtk = doJailbreak super.gtk;
# 2023-12-23: It needs this to build under ghc-9.6.3.
# A factor of 100 is insufficent, 200 seems seems to work.
hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip;
# Doctest comments have bogus imports.
bsb-http-chunked = dontCheck super.bsb-http-chunked;

View File

@ -49,8 +49,10 @@ self: super: {
unix = null;
xhtml = null;
#
# HLS
# https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html
#
haskell-language-server = super.haskell-language-server.override {
hls-class-plugin = null;
hls-fourmolu-plugin = null;
@ -64,7 +66,9 @@ self: super: {
hls-stylish-haskell-plugin = null;
};
#
# Version upgrades
#
th-abstraction = doDistribute self.th-abstraction_0_6_0_0;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_1_20231121;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_0;
@ -94,7 +98,9 @@ self: super: {
# https://github.com/judah/terminfo/pull/55#issuecomment-1876894232
terminfo_0_4_1_6 = doJailbreak super.terminfo_0_4_1_6;
#
# Test suite issues
#
unordered-containers = dontCheck super.unordered-containers; # ChasingBottoms doesn't support base 4.20
lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers == 0.6.*
# https://github.com/wz1000/HieDb/issues/64
@ -103,4 +109,12 @@ self: super: {
"--match" "!/hiedb/Command line/point-info/correctly prints type signatures/"
];
}) super.hiedb;
#
# Other build fixes
#
# 2023-12-23: It needs this to build under ghc-9.6.3.
# A factor of 100 is insufficent, 200 seems seems to work.
hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip;
}

View File

@ -2071,7 +2071,6 @@ dont-distribute-packages:
- hinduce-examples
- hinvaders
- hinze-streams
- hip
- hipbot
- hipe
- hipsql-client

View File

@ -147003,7 +147003,6 @@ self: {
];
description = "Haskell Image Processing (HIP) Library";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"hipbot" = callPackage