Merge commit '8dfad603247387df1df4826b8bea58efc5d012d8'

1 files changed, 7 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 8f6af23747f3..83a0821c054d 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -47,9 +47,8 @@ default-package-overrides:
   - implicit-hie < 0.1.3
   - hie-bios < 0.13
 
-  # 2023-07-06: newer versions of stylish-haskell require
-  # ghc-lib-parser-ex >= 9.6, but LTS-21 contains ghc-lib-parser-ex-9.4
-  - stylish-haskell < 0.14.5.0
+  # pandoc-crossref 0.3.17 needs pandoc >= 3.1.8
+  - pandoc-crossref < 0.3.17.0
 
   # 2023-09-17: reflex-dom 0.6.3.0 is broken https://github.com/reflex-frp/reflex-dom/issues/462
   - reflex-dom < 0.6.2.0
@@ -58,6 +57,9 @@ default-package-overrides:
   # https://github.com/obsidiansystems/dependent-sum-template/issues/5
   - dependent-sum-template < 0.1.2
 
+  # hls-floskell-plugin 2.4 does not yet support floskell 0.11
+  - floskell < 0.11
+
 extra-packages:
   - Cabal-syntax == 3.6.*               # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8
   - Cabal == 3.2.*                      # Used for packages needing newer Cabal on ghc 8.6 and 8.8
@@ -121,17 +123,13 @@ extra-packages:
   - mmorph == 1.1.3                     # Newest working version of mmorph on ghc 8.6.5. needed for hls
   - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
   - optparse-applicative < 0.16         # needed for niv-0.2.19
-  - ormolu == 0.5.0.1                   # 2022-02-21: for hls on ghc 8.10
+  - fourmolu == 0.11.*                  # 2023-10-22: for hls on ghc 9.0
   - ormolu == 0.5.2.0                   # 2023-08-08: for hls on ghc 9.0 and 9.2
-  - fourmolu == 0.9.0.0                 # 2022-09-21: for hls on ghc 8.10
-  - fourmolu == 0.10.1.0                # 2023-04-18: for hls on ghc 9.0 and 9.2
-  - fourmolu == 0.13.*                  # 2023-09-16: latest version compatible with hls 2.2.* on ghc 9.6
-  - mod == 0.1.2.2                      # needed for hls on ghc 8.10
   - pantry == 0.5.2.1                   # needed for stack-2.7.3
   - path == 0.9.0                       # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
   - resolv < 0.2                        # required to build cabal-install-3.10.1.0 with Stackage LTS 21
   - sbv == 7.13                         # required for pkgs.petrinizer
-  - stylish-haskell == 0.14.3.0         # 2022-09-19: needed for hls on ghc 8.8
+  - stylish-haskell == 0.14.4.0         # 2022-09-19: needed for hls on ghc 9.2
   - tasty-hspec == 1.1.6                # 2022-04-07: Needed for elm-format
   - text == 2.0.2                       # 2023-09-14: Needed for elm (which is currently on ghc-8.10)
   - th-abstraction < 0.6                # 2023-09-11: needed for aeson-2.2.0.0