diff options
| author | Tristan McLeay <tristan.mcleay@scrive.com> | 2023-04-18 11:10:06 +0200 |
|---|---|---|
| committer | Tristan McLeay <tristan.mcleay@scrive.com> | 2023-04-18 14:59:03 +0200 |
| commit | cc8b4a260ba2ea5d435460e5de58de2e1677ee94 (patch) | |
| tree | d3ba421b798f87fb47664384de4dd394b4f7ba03 /pkgs/development/haskell-modules | |
| parent | 9520d3dde0fab7f6e3ab58b25bb73812835208f8 (diff) | |
fourmolu: 0.10.0.0 -> 0.10.1.0
Restore bugfix release previously part of nixpkgs.
Diffstat (limited to 'pkgs/development/haskell-modules')
3 files changed, 4 insertions, 4 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 168e8cc9a77e1..ed7c0e7cbaa0d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -211,7 +211,7 @@ in { # 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); + }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_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-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index da366910a8d7e..fc1da79172ff9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -134,7 +134,7 @@ extra-packages: - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - primitive == 0.7.4.0 # 2023-03-04: primitive 0.8 is not compatible with too many packages on ghc 9.4 as of now - - fourmolu == 0.10.0.0 # 2023-04-03: for hls-fourmolu-plugin 1.1.1.0 + - fourmolu == 0.10.1.0 # 2023-04-18: for hls-fourmolu-plugin 1.1.1.0 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c9f59d265449e..bf5fe55584cec 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1083,11 +1083,11 @@ self: super: builtins.intersectAttrs super { }) super.fourmolu; # Test suite wants to run main executable - fourmolu_0_10_0_0 = overrideCabal (drv: { + fourmolu_0_10_1_0 = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_10_0_0; + }) super.fourmolu_0_10_1_0; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: { |