Merge pull request #80378 from simonchatts/hu-cabal-fmt

haskell.cabal-fmt: override Cabal to version 3.0.x
NixOS · Feb 18, 2020 · f829f1a · f829f1a
2 parents c0a22c4 + c39ed34
commit f829f1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1413,4 +1413,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
@@ -3488,7 +3488,6 @@ broken-packages:
   - cabal-dev
   - cabal-dir
   - cabal-flatpak
-  - cabal-fmt
   - cabal-ghc-dynflags
   - cabal-ghci
   - cabal-graphdeps