Skip to content

Commit

Permalink
haskell.packages.ghc94.ormolu: restore 0.5.* for 9.4 compat
Browse files Browse the repository at this point in the history
ormolu 0.6 wants ghc-lib* for GHC 9.6. It is probably possible to
upgrade to this version in the 9.4 set in principle, but this seems
simpler for now.
  • Loading branch information
sternenseemann committed Apr 12, 2023
1 parent fea0eb8 commit 31d0bee
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ in {
relative = "cborg";
}) super.cborg;

# https://github.com/tweag/ormolu/issues/941
ormolu = doDistribute self.ormolu_0_5_3_0;
# https://github.com/tweag/ormolu/issues/941
fourmolu = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.fourmolu_0_10_0_0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ extra-packages:
- optparse-applicative < 0.16 # needed for niv-0.2.19
- ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
- ormolu == 0.5.* # 2022-04-12: For ghc 9.4
- 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
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6
Expand Down
33 changes: 33 additions & 0 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 31d0bee

Please sign in to comment.