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

ghcjs: don't use extension for haddock override

Browse Source
This commit is contained in:
Charles Strahan 2014-12-27 23:10:07 -05:00
parent 780ec20283
commit 289e33f852
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/haskell-defaults.nix
View File

@ -245,15 +245,8 @@
}; };
packages_ghcjs = packages_ghcjs =
let parent = packages_ghc784.override { packages {
extension = self: super: { ghc = let parent = packages_ghc784; in parent.ghcjs // { inherit parent; };
haddock = super.haddock.override {
Cabal = null;
};
};
};
in packages {
ghc = parent.ghcjs // { inherit parent; };
cabalPackage = import ../build-support/cabal/ghcjs.nix; cabalPackage = import ../build-support/cabal/ghcjs.nix;
ghcWrapperPackage = import ../development/compilers/ghcjs/wrapper.nix; ghcWrapperPackage = import ../development/compilers/ghcjs/wrapper.nix;
prefFun = self : super : super // { prefFun = self : super : super // {

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

@ -940,6 +940,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ghcjs = callPackage ../development/tools/haskell/ghcjs { ghcjs = callPackage ../development/tools/haskell/ghcjs {
Cabal = self.Cabal_1_22_0_0; Cabal = self.Cabal_1_22_0_0;
cabalInstall = self.cabalInstall_1_22_0_0; cabalInstall = self.cabalInstall_1_22_0_0;
haddock = self.haddock.override {
Cabal = null;
};
}; };
ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {}; ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {};