diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cea6fd2a8ba8..7b6776164bc2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1619,6 +1619,9 @@ self: super: { # 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200 hls-refactor-plugin = dontCheck super.hls-refactor-plugin; + # 2022-11-18: https://github.com/haskell/haskell-language-server/commit/c1a7527c4fb348bee6093d9794b7d3e0c8d563f2 + hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.1.0.0"; doJailbreak super.hls-fourmolu-plugin; + # 2022-10-27: implicit-hie 0.1.3.0 needs a newer version of Cabal-syntax. implicit-hie = super.implicit-hie.override { Cabal-syntax = self.Cabal-syntax_3_8_1_0; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 468e2ca08c6a..5ad58d156300 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -304,9 +304,9 @@ self: super: ({ ormolu_0_5_0_1 = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.ormolu_0_5_0_1); - fourmolu_0_8_2_0 = overrideCabal (drv: { + fourmolu_0_9_0_0 = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu_0_8_2_0); + }) (disableCabalFlag "fixity-th" super.fourmolu_0_9_0_0); } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index fdabda3e58a9..9e0ee396b2c7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -208,7 +208,7 @@ self: super: { jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - fourmolu = super.fourmolu_0_8_2_0; + fourmolu = super.fourmolu_0_9_0_0; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8f9e6d0ce185..d37fd3f7e6a5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -989,11 +989,11 @@ self: super: builtins.intersectAttrs super { }) super.procex; # Test suite wants to run main executable - fourmolu_0_8_2_0 = overrideCabal (drv: { + fourmolu_0_9_0_0 = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_8_2_0; + }) super.fourmolu_0_9_0_0; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: {