diff options
| author | Peter Simons <simons@cryp.to> | 2019-02-01 13:37:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 13:37:02 +0100 |
| commit | 5649eb713ea9f57e7bae49aaf17a46557776806d (patch) | |
| tree | 6f0330bd69a3b467c3d6c73bfab2cb8c81964b67 /pkgs/development/haskell-modules | |
| parent | 0c4786cf764907d3faa914204bbd9c637667735e (diff) | |
| parent | 0969e9138903c80f1c43a90193e05934bc346cb4 (diff) | |
| download | nixpkgs-5649eb713ea9f57e7bae49aaf17a46557776806d.tar nixpkgs-5649eb713ea9f57e7bae49aaf17a46557776806d.tar.gz nixpkgs-5649eb713ea9f57e7bae49aaf17a46557776806d.tar.bz2 nixpkgs-5649eb713ea9f57e7bae49aaf17a46557776806d.tar.lz nixpkgs-5649eb713ea9f57e7bae49aaf17a46557776806d.tar.xz nixpkgs-5649eb713ea9f57e7bae49aaf17a46557776806d.tar.zst nixpkgs-5649eb713ea9f57e7bae49aaf17a46557776806d.zip | |
Merge pull request #53978 from ElvishJerricco/ghcjs-8.4-8.6-fixes
GHCJS: Fix 8.4 and add 8.6
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 04e0a755d10..bd51e4f6c85 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -76,4 +76,7 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); + # cabal2nix doesn't list this because of a conditional on the GHC version. + aeson = addBuildDepend super.aeson self.contravariant; + } |