diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9841264cf5cc..69ec24e3c109 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2767,6 +2767,7 @@ self: super: { # Tests fail due to the newly-build fourmolu not being in PATH # https://github.com/fourmolu/fourmolu/issues/231 fourmolu_0_14_0_0 = dontCheck super.fourmolu_0_14_0_0; + fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0; # Merged upstream, but never released. Allows both intel and aarch64 darwin to build. # https://github.com/vincenthz/hs-gauge/pull/106 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 82c5878a3ca0..e9f420db2684 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -175,7 +175,7 @@ self: super: { hls-floskell-plugin = null; }; - fourmolu = super.fourmolu_0_14_0_0; + fourmolu = super.fourmolu_0_13_1_0; ormolu = super.ormolu_0_7_2_0; stylish-haskell = super.stylish-haskell_0_14_5_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 91c40b441ebe..17fdbb5bcad3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -122,6 +122,7 @@ extra-packages: - 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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 340044a61476..f374c1321759 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -108742,6 +108742,43 @@ self: { mainProgram = "fourmolu"; }) {}; + "fourmolu_0_13_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, binary + , bytestring, Cabal-syntax, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, pretty, process, QuickCheck, scientific, syb + , temporary, text, th-env, yaml + }: + mkDerivation { + pname = "fourmolu"; + version = "0.13.1.0"; + sha256 = "05vkqygrmgfgmsd8a4vxq8mq0c1z9cb3hja28aszd6llfv427dm1"; + revision = "1"; + editedCabalFile = "0jqgixycw8cv0q7amx5fs4ml9knql70ghg31br3hjkcy0vb2hi5v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base binary bytestring Cabal-syntax + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env yaml + ]; + testHaskellDepends = [ + base bytestring Cabal-syntax containers Diff directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + pretty process QuickCheck temporary text yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fourmolu"; + }) {}; + "fourmolu_0_14_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, deepseq, Diff, directory