git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Revert "builder: Remove self from depends of "all" component"
bda8ae7Will Fancher
builder/comp-builder.nix+3−7
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -43,15 +43,11 @@ let
43 echo "${field}: ${lib.concatStringsSep " " xs}" >> $out/cabal.config
43 echo "${field}: ${lib.concatStringsSep " " xs}" >> $out/cabal.config
44 '';
44 '';
45
45
46− componentDepends = if haskellLib.isAll componentId
47− then lib.filter (p: p.identifier.name != componentId.cname) component.depends
48− else component.depends;
49−
50 flatDepends =
46 flatDepends =
51 let
47 let
52 makePairs = map (p: rec { key="${val}"; val=p.components.library; });
48 makePairs = map (p: rec { key="${val}"; val=p.components.library; });
53 closure = builtins.genericClosure {
49 closure = builtins.genericClosure {
54− startSet = makePairs componentDepends;
50+ startSet = makePairs component.depends;
55 operator = {val,...}: makePairs val.config.depends;
51 operator = {val,...}: makePairs val.config.depends;
56 };
52 };
57 in map ({val,...}: val) closure;
53 in map ({val,...}: val) closure;
@@ -109,7 +105,7 @@ let
109 clear-package-db
105 clear-package-db
110 package-db $out/package.conf.d
106 package-db $out/package.conf.d
111 EOF
107 EOF
112− ${lib.concatMapStringsSep "\n" (p: envDep "--package-db ${p.components.library}/package.conf.d" p.identifier.name) componentDepends}
108+ ${lib.concatMapStringsSep "\n" (p: envDep "--package-db ${p.components.library}/package.conf.d" p.identifier.name) component.depends}
113 ${lib.concatMapStringsSep "\n" (envDep "") (lib.remove "ghc" nonReinstallablePkgs)}
109 ${lib.concatMapStringsSep "\n" (envDep "") (lib.remove "ghc" nonReinstallablePkgs)}
114
110
115 '' + lib.optionalString component.doExactConfig ''
111 '' + lib.optionalString component.doExactConfig ''
@@ -117,7 +113,7 @@ let
117 echo "allow-newer: ${package.identifier.name}:*" >> $out/cabal.config
113 echo "allow-newer: ${package.identifier.name}:*" >> $out/cabal.config
118 echo "allow-older: ${package.identifier.name}:*" >> $out/cabal.config
114 echo "allow-older: ${package.identifier.name}:*" >> $out/cabal.config
119
115
120− ${lib.concatMapStringsSep "\n" (p: exactDep "--package-db ${p.components.library}/package.conf.d" p.identifier.name) componentDepends}
116+ ${lib.concatMapStringsSep "\n" (p: exactDep "--package-db ${p.components.library}/package.conf.d" p.identifier.name) component.depends}
121 ${lib.concatMapStringsSep "\n" (exactDep "") nonReinstallablePkgs}
117 ${lib.concatMapStringsSep "\n" (exactDep "") nonReinstallablePkgs}
122
118
123 ''
119 ''