about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorSimon Chatterjee <code@chatts.net>2020-02-17 17:45:05 +0000
committerPeter Simons <simons@cryp.to>2020-02-28 20:31:23 +0100
commit3d7b19344d8e3c81ac5f23af776f09ec88962099 (patch)
treebd3be4bf3b7f47e60785c6b1f2672d99234301b7 /pkgs/development
parentee52b6ac6835479363b26dd6c03ff1b4a7a4652e (diff)
downloadnixlib-3d7b19344d8e3c81ac5f23af776f09ec88962099.tar
nixlib-3d7b19344d8e3c81ac5f23af776f09ec88962099.tar.gz
nixlib-3d7b19344d8e3c81ac5f23af776f09ec88962099.tar.bz2
nixlib-3d7b19344d8e3c81ac5f23af776f09ec88962099.tar.lz
nixlib-3d7b19344d8e3c81ac5f23af776f09ec88962099.tar.xz
nixlib-3d7b19344d8e3c81ac5f23af776f09ec88962099.tar.zst
nixlib-3d7b19344d8e3c81ac5f23af776f09ec88962099.zip
haskell-cabal-fmt: override Cabal to version 3.0.x
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml1
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 47b030d77cf8..13ce36eff06d 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 f69e068d6370..a25977eff3b6 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