diff options
| author | Peter Simons <simons@cryp.to> | 2017-08-23 14:28:01 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-08-23 19:53:11 +0200 |
| commit | 074581c1a4f0c3d042a6d21211d70d020711a8d8 (patch) | |
| tree | 68c973877c14353ed11e11c586f22dced218ff89 | |
| parent | b8314072f96fb2505f398c2db5ce4ba52fa9b738 (diff) | |
| download | nixpkgs-074581c1a4f0c3d042a6d21211d70d020711a8d8.tar nixpkgs-074581c1a4f0c3d042a6d21211d70d020711a8d8.tar.gz nixpkgs-074581c1a4f0c3d042a6d21211d70d020711a8d8.tar.bz2 nixpkgs-074581c1a4f0c3d042a6d21211d70d020711a8d8.tar.lz nixpkgs-074581c1a4f0c3d042a6d21211d70d020711a8d8.tar.xz nixpkgs-074581c1a4f0c3d042a6d21211d70d020711a8d8.tar.zst nixpkgs-074581c1a4f0c3d042a6d21211d70d020711a8d8.zip | |
haskell-comonad: fix build with ghc-7.10.x and earlier
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 4e5eabae802..7375072647d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -206,4 +206,7 @@ self: super: { # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; + # The test suite requires Cabal 1.24.x or later to compile. + comonad = dontCheck super.comonad; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 3c2f5841452..ca9597de48d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -158,4 +158,7 @@ self: super: { # extra-test: <stdout>: hFlush: invalid argument (Bad file descriptor) extra = dontCheck super.extra; + # The test suite requires Cabal 1.24.x or later to compile. + comonad = dontCheck super.comonad; + } |