Commit 31d0beef authored by sternenseemann's avatar sternenseemann
Browse files

haskell.packages.ghc94.ormolu: restore 0.5.* for 9.4 compat 

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.
parent fea0eb85

pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix

+1 −1
Original line number Diff line number Diff line
@@ -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);

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/development/haskell-modules/hackage-packages.nix

+33 −0
Original line number Diff line number Diff line
@@ -214761,6 +214761,39 @@ self: { 
       mainProgram = "ormolu";

     }) {};













  "ormolu_0_5_3_0" = callPackage













    ({ mkDerivation, ansi-terminal, array, base, binary, bytestring













     , Cabal-syntax, containers, Diff, directory, dlist, file-embed













     , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec













     , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io













     , QuickCheck, syb, temporary, text, th-env













     }:













     mkDerivation {













       pname = "ormolu";













       version = "0.5.3.0";













       sha256 = "13x0iasi2mrwv6mnhg2clkaa0znm6i058vssyxri9mdi147sb3pk";













       isLibrary = true;













       isExecutable = true;













       libraryHaskellDepends = [













         ansi-terminal array base binary bytestring Cabal-syntax containers













         Diff directory dlist file-embed filepath ghc-lib-parser megaparsec













         MemoTrie mtl syb text













       ];













       executableHaskellDepends = [













         base containers directory filepath ghc-lib-parser













         optparse-applicative text th-env













       ];













       testHaskellDepends = [













         base Cabal-syntax containers directory filepath ghc-lib-parser













         hspec hspec-megaparsec path path-io QuickCheck temporary text













       ];













       testToolDepends = [ hspec-discover ];













       description = "A formatter for Haskell source code";













       license = lib.licenses.bsd3;













       hydraPlatforms = lib.platforms.none;













       mainProgram = "ormolu";













     }) {};



























  "ormolu_0_6_0_1" = callPackage















    ({ mkDerivation, ansi-terminal, array, base, binary, bytestring















     , Cabal-syntax, containers, deepseq, Diff, directory, file-embed