From 12e94a519bc861c1bb21dfc3dbd95121171c6c19 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 3 Dec 2021 13:51:19 +0100 Subject: [PATCH] haskell.packages.ghc901.ormolu: pin to 0.3.* ormolu >= 0.4 seems to require GHC 9.2.1 --- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f5c5aa43600b..e54549e89915 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -157,6 +157,7 @@ extra-packages: - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.1 + - ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.1 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d3fe0be85522..17fa519c9bd4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -202115,6 +202115,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "ormolu_0_3_1_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers + , Diff, directory, dlist, exceptions, filepath, ghc-lib-parser + , gitrev, hspec, hspec-discover, mtl, optparse-applicative, path + , path-io, syb, temporary, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.3.1.0"; + sha256 = "1517z6bi8ifzdmfclmqdiipi6zcnxagymf1sxr43sj2ipkglg2rs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring Cabal containers Diff directory dlist + exceptions filepath ghc-lib-parser mtl syb text + ]; + executableHaskellDepends = [ + base filepath ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers directory filepath hspec path path-io temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ormolu_0_4_0_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, Cabal , containers, Diff, directory, dlist, exceptions, filepath