mirror of
https://github.com/nix-community/dream2nix.git
synced 2025-01-07 07:09:26 +03:00
fix: expose all builder outputs (#162)
* fix: expose all builder outputs * fix: don't recursively update into derivations
This commit is contained in:
parent
c83389fd43
commit
8d275a1dc9
@ -551,20 +551,16 @@
|
||||
(outputs.packages or {});
|
||||
};
|
||||
|
||||
projectOutputs =
|
||||
l.map
|
||||
(proj: outputsForProject proj)
|
||||
translatedProjects;
|
||||
projectOutputs = l.map outputsForProject translatedProjects;
|
||||
|
||||
mergedOutputs =
|
||||
l.foldl'
|
||||
(all: outputs:
|
||||
all
|
||||
// {
|
||||
packages = all.packages or {} // outputs.packages;
|
||||
})
|
||||
{}
|
||||
projectOutputs;
|
||||
mergedOutputs = let
|
||||
isNotDrvAttrs = val:
|
||||
l.isAttrs val && (val.type or "") != "derivation";
|
||||
recursiveUpdateUntilDrv =
|
||||
l.recursiveUpdateUntil
|
||||
(_: l: r: !(isNotDrvAttrs l && isNotDrvAttrs r));
|
||||
in
|
||||
l.foldl' recursiveUpdateUntilDrv {} projectOutputs;
|
||||
in
|
||||
mergedOutputs;
|
||||
in {
|
||||
|
Loading…
Reference in New Issue
Block a user