diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-04-13 00:23:15 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-04-13 00:23:15 +0200 |
commit | 31d0beef68f0e29e0538674c0e3d97357b4d3e51 (patch) | |
tree | 75fccd8f00670970bba635552ed611b1d44ebe18 /pkgs/development/haskell-modules | |
parent | fea0eb858a6bdae569db4f183f8b6557c236fb17 (diff) |
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.
Diffstat (limited to 'pkgs/development/haskell-modules')
3 files changed, 35 insertions, 1 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 b094aa941adec..168e8cc9a77e1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -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); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 464bbf27c58d3..8dde53af696bd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c57bae6dc844e..3b3d0853f6260 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -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 |