public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16053 from obadz/ghc-mod-ghc8

Browse Source 
haskellPackages.ghc-mod: add support for GHC8
This commit is contained in:
Peter Simons 2016-06-07 21:50:35 +02:00
commit 3e4cd62903
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -755,7 +755,7 @@ self: super: {
lens-aeson = dontCheck super.lens-aeson; lens-aeson = dontCheck super.lens-aeson;
# Byte-compile elisp code for Emacs. # 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"; preCheck = "export HOME=$TMPDIR";
testToolDepends = drv.testToolDepends or [] ++ [self.cabal-install]; testToolDepends = drv.testToolDepends or [] ++ [self.cabal-install];
doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335

2
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -210,4 +210,6 @@ self: super: {
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); 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; };
} }

9
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
View File

@ -53,4 +53,13 @@ self: super: {
license = pkgs.stdenv.lib.licenses.bsd3; 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";
};
});
} }