From cd111f458f4db5ca5ef6c1316c3fa6fc12b241a8 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 30 Mar 2023 13:33:10 +0900 Subject: [PATCH] haskell.packages.ghc944.fourmolu_0_11_0_0: unbreak --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 +- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 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 dd472ae93f5a..4e61341c0dd9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -221,7 +221,7 @@ in { ormolu = doDistribute self.ormolu_0_5_3_0; fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0); + }) (disableCabalFlag "fixity-th" super.fourmolu_0_11_0_0); # Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455 # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2b15a2ab1fd1..b03137eb2cae 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -979,11 +979,11 @@ self: super: builtins.intersectAttrs super { }) super.fourmolu; # Test suite wants to run main executable - fourmolu_0_10_1_0 = overrideCabal (drv: { + fourmolu_0_11_0_0 = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_10_1_0; + }) super.fourmolu_0_11_0_0; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: {