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

Merge pull request #24715 from ljli/ghcjs-dep-cycle

Browse Source 
haskell: ghcjs packages: Break dependency cycle less invasive
This commit is contained in:
Aristid Breitkreuz 2017-04-08 12:25:54 +02:00 committed by GitHub
commit a0eabfbcbd
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/ghcjs/head_stage2.nix
View File

@ -382,7 +382,6 @@
version = "1.24.0.0";
src = "${ghcjsBoot}/boot/cabal/Cabal";
doCheck = false;
hyperlinkSource = false;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
pretty process time unix

1
pkgs/development/compilers/ghcjs/stage2.nix
View File

@ -327,7 +327,6 @@
version = "1.22.8.0";
src = "${ghcjsBoot}/boot/cabal/Cabal";
doCheck = false;
hyperlinkSource = false;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
pretty process time unix

10
pkgs/development/haskell-modules/configuration-ghcjs.nix
View File

@ -58,9 +58,13 @@ self: super:
# Almost all packages require Cabal to build their Setup.hs,
# but usually they don't declare it explicitly as they don't need to for normal GHC.
# To account for that we add Cabal by default.
mkDerivation = args:
if args.pname == "Cabal" then super.mkDerivation args else super.mkDerivation (args //
{ setupHaskellDepends = (args.setupHaskellDepends or []) ++ [ self.Cabal ]; });
mkDerivation = args: super.mkDerivation (args // {
setupHaskellDepends = (args.setupHaskellDepends or []) ++
(if args.pname == "Cabal" then [ ]
# Break the dependency cycle between Cabal and hscolour
else if args.pname == "hscolour" then [ (dontHyperlinkSource self.Cabal) ]
else [ self.Cabal ]);
});
## OTHER PACKAGES