From 3d7b19344d8e3c81ac5f23af776f09ec88962099 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Mon, 17 Feb 2020 17:45:05 +0000 Subject: [PATCH] haskell-cabal-fmt: override Cabal to version 3.0.x --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 47b030d77cf..13ce36eff06 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1403,4 +1403,7 @@ self: super: { ''; }); + # cabal-fmt requires Cabal3 + cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_0_0_0; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f69e068d637..a25977eff3b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3328,7 +3328,6 @@ broken-packages: - cabal-dev - cabal-dir - cabal-flatpak - - cabal-fmt - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps