Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions nix/lib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ let
aspect
// {
__functor = self: ctx: {
includes = builtins.filter (x: x != { }) (map (apply ctx) (builtins.filter isFn self.includes));
includes = builtins.filter (x: x != { }) (
map (apply ctx) (builtins.filter isFn (self.includes or [ ]))
);
};
};

Expand All @@ -35,7 +37,7 @@ let
self:
{ class, aspect-chain }:
{
includes = map (applyStatics { inherit class aspect-chain; }) self.includes;
includes = map (applyStatics { inherit class aspect-chain; }) (self.includes or [ ]);
};
};

Expand Down
6 changes: 3 additions & 3 deletions templates/ci/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions templates/ci/modules/features/provides-parametric.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{ denTest, inputs, ... }:
{

flake.tests.provides-parametric = {

test-parametric-inside-provides = denTest (
{
den,
ns,
igloo,
...
}:
{
den.hosts.x86_64-linux.igloo.users.tux = { };

imports = [ (inputs.den.namespace "ns" false) ];

ns.foo = den.lib.parametric { };
ns.bar.provides.baz = den.lib.parametric { };
ns.a = den.lib.parametric {
provides.b = den.lib.parametric { };
provides.c = den.lib.parametric { };
provides.d = den.lib.parametric {
provides.e = den.lib.parametric { nixos.networking.hostName = "pinguino"; };
};
};

den.aspects.igloo.includes = [
ns.foo
ns.bar._.baz
ns.a
ns.a._.b
ns.a._.c
ns.a._.d
ns.a._.d._.e
];

expr = igloo.networking.hostName;
expected = "pinguino";
}
);

};

}
Loading