diff options
| author | Peter Simons <simons@cryp.to> | 2017-10-17 18:21:03 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-10-17 20:35:30 +0200 |
| commit | 09a13160dd104f36c2eae5683998cf27950b1d0f (patch) | |
| tree | 38011370508233a64ff57e6b8d7df020f1e32640 | |
| parent | f9b72047f8c61140e2f928f2df1c7777fab3dede (diff) | |
| download | nixlib-09a13160dd104f36c2eae5683998cf27950b1d0f.tar nixlib-09a13160dd104f36c2eae5683998cf27950b1d0f.tar.gz nixlib-09a13160dd104f36c2eae5683998cf27950b1d0f.tar.bz2 nixlib-09a13160dd104f36c2eae5683998cf27950b1d0f.tar.lz nixlib-09a13160dd104f36c2eae5683998cf27950b1d0f.tar.xz nixlib-09a13160dd104f36c2eae5683998cf27950b1d0f.tar.zst nixlib-09a13160dd104f36c2eae5683998cf27950b1d0f.zip | |
liquidhaskell: new release copes with recent versions of its dependencies
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e753ee94ffe..ba5ef0348ab7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -891,9 +891,8 @@ self: super: { # https://github.com/danidiaz/tailfile-hinotify/issues/2 tailfile-hinotify = dontCheck super.tailfile-hinotify; - # build liquidhaskell with the proper (old) aeson version - liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; }; - aeson_0_11_3_0 = super.aeson_0_11_3_0.override { base-orphans = self.base-orphans_0_5_4; }; + # build liquidhaskell with the proper (new) aeson version + liquidhaskell = super.liquidhaskell.override { aeson = dontCheck self.aeson_1_2_2_0; }; # Test suite fails: https://github.com/lymar/hastache/issues/46. # Don't install internal mkReadme tool. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 360f86f340e5..f7a3019d3ea1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2517,10 +2517,8 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier - - aeson < 1 # required by liquidhaskell-0.8.0.0 - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - - base-orphans < 0.6 # required by liquidhaskell-0.8.0.0 - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 1.18.* # required for cabal-install et al on old GHC versions |