Merge pull request #24715 from ljli/ghcjs-dep-cycle
haskell: ghcjs packages: Break dependency cycle less invasive
This commit is contained in:
commit
a0eabfbcbd
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user