diff options
| author | Peter Simons <simons@cryp.to> | 2020-05-25 22:00:57 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-05-29 22:28:47 +0200 |
| commit | fbc0845f2865227404a8109df470a4a933ebac2b (patch) | |
| tree | 6d13d6f2097182b7227d1f51868643da32f9b881 /pkgs/development/haskell-modules | |
| parent | 330227bc6c6e34576e7b46106d418e92855525fb (diff) | |
haskell-cabal-fmt: overriding Cabal-3.2 is unnecessary for ghc-8.10.x and beyond
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e3ce1ee73d7a5..d741d76d047dc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1311,9 +1311,6 @@ self: super: { ''; }); - # cabal-fmt requires Cabal3 - cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; }; - # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that # patch here. That single patch is for the gtk2hs super-repo, out of which diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 7395d059b4d7f..c23b15ffef3e0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -106,4 +106,7 @@ self: super: { # The package needs the latest Cabal version. cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + # cabal-fmt requires Cabal3 + cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; }; + } |