diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 3004ef928bce..91213b0274d3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -65,21 +65,25 @@ self: super: { # Version deviations from Stackage LTS # - doctest = doDistribute super.doctest_0_22_1; + doctest = doDistribute super.doctest_0_22_2; http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18 some = doDistribute self.some_1_0_5; th-abstraction = doDistribute self.th-abstraction_0_6_0_0; th-desugar = doDistribute self.th-desugar_1_15; semigroupoids = doDistribute self.semigroupoids_6_0_0_1; bifunctors = doDistribute self.bifunctors_5_6_1; - base-compat = doDistribute self.base-compat_0_13_0; - base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0; + base-compat = doDistribute self.base-compat_0_13_1; + base-compat-batteries = doDistribute self.base-compat-batteries_0_13_1; fgl = doDistribute self.fgl_5_8_1_1; # Because we bumped the version of th-abstraction above.^ aeson = doJailbreak super.aeson; free = doJailbreak super.free; + # Because we bumped the version of base-compat above.^ + cabal-plan = unmarkBroken super.cabal-plan; + cabal-plan-bounds = unmarkBroken super.cabal-plan-bounds; + # Requires filepath >= 1.4.100.0 <=> GHC >= 9.6 file-io = unmarkBroken super.file-io; @@ -87,8 +91,8 @@ self: super: { # https://github.com/mokus0/th-extras/pull/21 th-extras = doJailbreak super.th-extras; - ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523; + ghc-lib = doDistribute self.ghc-lib_9_6_3_20231014; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231014; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; # Tests fail due to the newly-build fourmolu not being in PATH @@ -196,8 +200,8 @@ self: super: { hw-prim = dontCheck (doJailbreak super.hw-prim); stm-containers = dontCheck super.stm-containers; regex-tdfa = dontCheck super.regex-tdfa; - rebase = doJailbreak super.rebase_1_20; - rerebase = doJailbreak super.rerebase_1_20; + rebase = doJailbreak super.rebase_1_20_1_1; + rerebase = doJailbreak super.rerebase_1_20_1_1; hiedb = dontCheck super.hiedb; retrie = dontCheck super.retrie; # https://github.com/kowainik/relude/issues/436 @@ -271,7 +275,5 @@ self: super: { # the workaround on 9.6 is to revert to the LLVM backend (which is used # for these sorts of situations even on 9.2 and 9.4). # https://gitlab.haskell.org/ghc/ghc/-/issues/23746#note_525318 - tls = appendConfigureFlags - (lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ "--ghc-option=-fllvm" ]) - super.tls; + tls = if pkgs.stdenv.hostPlatform.isAarch64 then self.forceLlvmCodegenBackend super.tls else super.tls; } |