diff options
| author | Peter Simons <simons@cryp.to> | 2016-06-07 21:50:35 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-06-07 21:50:35 +0200 |
| commit | 3e4cd6290379e5db89771a0d24cc0537be0fee89 (patch) | |
| tree | b1ddd530fc4133de05a7267a774da2fab71e59f8 /pkgs/development/haskell-modules | |
| parent | 99717f7a569de6f9c36938114a274945de2ad080 (diff) | |
| parent | 679a51b1164c577335e424882cd4df0acf96e961 (diff) | |
| download | nixlib-3e4cd6290379e5db89771a0d24cc0537be0fee89.tar nixlib-3e4cd6290379e5db89771a0d24cc0537be0fee89.tar.gz nixlib-3e4cd6290379e5db89771a0d24cc0537be0fee89.tar.bz2 nixlib-3e4cd6290379e5db89771a0d24cc0537be0fee89.tar.lz nixlib-3e4cd6290379e5db89771a0d24cc0537be0fee89.tar.xz nixlib-3e4cd6290379e5db89771a0d24cc0537be0fee89.tar.zst nixlib-3e4cd6290379e5db89771a0d24cc0537be0fee89.zip | |
Merge pull request #16053 from obadz/ghc-mod-ghc8
haskellPackages.ghc-mod: add support for GHC8
Diffstat (limited to 'pkgs/development/haskell-modules')
3 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad80d46c87ba..5fc1aa9d519a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -755,7 +755,7 @@ self: super: { lens-aeson = dontCheck super.lens-aeson; # Byte-compile elisp code for Emacs. - ghc-mod = overrideCabal (super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }) (drv: { + ghc-mod = overrideCabal super.ghc-mod (drv: { preCheck = "export HOME=$TMPDIR"; testToolDepends = drv.testToolDepends or [] ++ [self.cabal-install]; doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 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 fcadc790baa9..2e7ac52c8de6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -210,4 +210,6 @@ self: super: { semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); + # 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; }; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 292d8d746806..c11381a96039 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -53,4 +53,13 @@ self: super: { license = pkgs.stdenv.lib.licenses.bsd3; }) {}; + # ghc-mod has a ghc-8 branch that has not yet been merged + ghc-mod = super."ghc-mod".overrideDerivation (attrs: rec { + src = pkgs.fetchFromGitHub { + owner = "DanielG"; + repo = "ghc-mod"; + rev = "f2c7b01e372dd8c516b1ccbe5a1025cc7814347c"; + sha256 = "1i45196qrzlhgbisnvkzni4n54saky0i1kyla162xcb5cg3kf2ji"; + }; + }); } |