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

Dont haddock ghcjs in either version

Browse Source
This commit is contained in:
Will Fancher 2018-05-16 03:09:22 -04:00
parent 64df9b6b89
commit d86edd5161
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
View File

@ -1,6 +0,0 @@
{ haskellLib }:
let inherit (haskellLib) dontHaddock;
in self: super: {
ghcjs = dontHaddock super.ghcjs;
}

2
pkgs/development/compilers/ghcjs-ng/common-overrides.nix
View File

@ -3,6 +3,6 @@
let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
in self: super: { in self: super: {
ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
ghcjs = appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"; ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
} }

1
pkgs/top-level/haskell-packages.nix
View File

@ -93,7 +93,6 @@ in rec {
inherit (bootPkgs) alex happy; inherit (bootPkgs) alex happy;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {};
}; };
ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec { ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
bootPkgs = packages.ghc842; bootPkgs = packages.ghc842;