diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 9a600b5b60281..e57435695cdb9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -58,10 +58,6 @@ in { # Tests fail because of typechecking changes conduit = dontCheck super.conduit; - # 0.30 introduced support for GHC 9.2. - cryptonite = doDistribute self.cryptonite_0_30; - - doctest = self.doctest_0_20_1; # consequences of doctest breakage follow: double-conversion = markBroken super.double-conversion; @@ -69,8 +65,6 @@ in { ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen); lucid = jailbreakForCurrentVersion super.lucid "2.11.1"; - invariant = jailbreakForCurrentVersion super.invariant "0.5.6"; - implicit-hie-cradle = jailbreakForCurrentVersion super.implicit-hie-cradle "0.5.0.0"; haskell-src-meta = doJailbreak super.haskell-src-meta; @@ -80,13 +74,10 @@ in { # Jailbreaks & Version Updates aeson = self.aeson_2_1_1_0; - lens-aeson = self.lens-aeson_1_2_2; assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; - base-compat = self.base-compat_0_12_2; - base-compat-batteries = self.base-compat-batteries_0_12_2; binary-instances = doJailbreak super.binary-instances; ChasingBottoms = doJailbreak super.ChasingBottoms; constraints = doJailbreak super.constraints; @@ -99,7 +90,6 @@ in { ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_3_20221104; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0; hackage-security = doJailbreak super.hackage-security; - hashable = super.hashable_1_4_1_0; hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); @@ -115,20 +105,17 @@ in { regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; - - # 2022-09-02: Too strict bounds on lens - # https://github.com/GetShopTV/swagger2/pull/242 - swagger2 = doJailbreak super.swagger2; + rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; base-orphans = dontCheck super.base-orphans; # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned # hspec packages in configuration-common.nix. - hspec = self.hspec_2_10_6; - hspec-core = self.hspec-core_2_10_6; + hspec = self.hspec_2_10_7; + hspec-core = self.hspec-core_2_10_7; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_6; + hspec-discover = self.hspec-discover_2_10_7; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 @@ -136,11 +123,9 @@ in { # We need >= 1.1.2 for ghc-9.4 support, but we don't have 1.1.x in # hackage-packages.nix hedgehog = doDistribute (dontHaddock super.hedgehog_1_2); - # does not work with hedgehog 1.2 yet: + # tasty-hedgehog > 1.3 necessary to work with hedgehog 1.2: # https://github.com/qfpl/tasty-hedgehog/pull/63 - tasty-hedgehog = markBroken super.tasty-hedgehog; - # due to tasty-hedgehog - retry = checkAgainAfter super.tasty-hedgehog "1.3.0.0" "tasty-hedgehog broken" (dontCheck super.retry); + tasty-hedgehog = self.tasty-hedgehog_1_4_0_0; # https://github.com/dreixel/syb/issues/38 syb = dontCheck super.syb; @@ -154,10 +139,6 @@ in { vector = dontCheck super.vector; vector-binary-instances = doJailbreak super.vector-binary-instances; - # fixed in 1.16.x but it's not in hackage-packages yet. - rebase = jailbreakForCurrentVersion super.rebase "1.15.0.3"; - rerebase = jailbreakForCurrentVersion super.rerebase "1.15.0.3"; - hpack = overrideCabal (drv: { # Cabal 3.6 seems to preserve comments when reading, which makes this test fail # 2021-10-10: 9.2.1 is not yet supported (also no issue) @@ -188,20 +169,12 @@ in { jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed - hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables; - # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 ghc-check = dontHaddock super.ghc-check; - # 2022-11-06: Override override from common, because Cabal-syntax is included since ghc 9.4. - implicit-hie = super.implicit-hie.override { - Cabal-syntax = null; - }; - # 2022-10-06: plugins disabled for hls 1.8.0.0 based on # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers haskell-language-server = super.haskell-language-server.override { @@ -215,10 +188,7 @@ in { hls-ormolu-plugin = null; hls-rename-plugin = null; hls-stylish-haskell-plugin = null; - hls-tactics-plugin = null; - hls-haddock-comments-plugin = null; hls-retrie-plugin = null; - hls-splice-plugin = null; }; # https://github.com/tweag/ormolu/issues/941 |