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
4 changes: 3 additions & 1 deletion modules/aspects/provides/flake-parts/inputs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ let
user,
host,
}:
lib.mkMerge (map (c: mkAspect c host.system) user.classes);
{
includes = map (c: mkAspect c host.system) user.classes;
};

hmAspect = { home }: mkAspect home.class home.system;

Expand Down
4 changes: 3 additions & 1 deletion modules/aspects/provides/flake-parts/self.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ let
user,
host,
}:
lib.mkMerge (map (c: mkAspect c host.system) user.classes);
{
includes = map (c: mkAspect c host.system) user.classes;
};

homeAspect = { home }: mkAspect home.class home.system;
in
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{ denTest, ... }:
{
flake.tests.deadbugs-issue-369 = {

test-self-arg-includes = denTest (
{
den,
lib,
inputs,
tuxHm,
...
}:
{
den.hosts.x86_64-linux.igloo.users.tux = { };
den.default.homeManager.home.stateVersion = "25.11";

den.default.includes = [ den._.self' ];
den.aspects.tux.includes = [ den.aspects.hola ];

den.aspects.hola.homeManager =
{ self', ... }@args:
{
home.sessionVariables.FOO = lib.getName self'.legacyPackages.hello;
};

expr = tuxHm.home.sessionVariables.FOO;
expected = "hello";
}
);

test-inputs-arg-includes = denTest (
{
den,
lib,
inputs,
tuxHm,
...
}:
{
den.hosts.x86_64-linux.igloo.users.tux = { };
den.default.homeManager.home.stateVersion = "25.11";

den.default.includes = [ den._.inputs' ];
den.aspects.tux.includes = [ den.aspects.hola ];

den.aspects.hola.homeManager =
{ inputs', ... }@args:
{
home.sessionVariables.FOO = lib.getName inputs'.nixpkgs.legacyPackages.hello;
};

expr = tuxHm.home.sessionVariables.FOO;
expected = "hello";
}
);

test-everything-includes = denTest (
{
den,
lib,
igloo,
inputs,
gloom,
__findFile,
tuxHm,
...
}:
{
imports = [ (inputs.den.namespace "gloom" false) ];
_module.args.__findFile = den.lib.__findFile;

den.hosts.x86_64-linux.igloo.users.tux = { };
den.default.homeManager.home.stateVersion = "25.11";

den.default.includes = [
den._.inputs'
den._.define-user
];
den.aspects.tux.includes = [ gloom.everywhere ];
gloom.everywhere.includes = [ <gloom/apps/helix> ];

gloom.apps.provides.helix.homeManager =
{ inputs', ... }@args:
{
home.packages = [ inputs'.nixpkgs.legacyPackages.hello ];
};

expr = builtins.elem "hello" (map lib.getName tuxHm.home.packages);
expected = true;
}
);

};
}
9 changes: 6 additions & 3 deletions templates/ci/modules/test-support/eval-den.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ let
inherit ((evalDen module).config) expr expected;
};

# fake-parts
# emulate fake-parts only for self and nixpkgs.
withSystem =
system:
let
inputs' = builtins.mapAttrs (_: builtins.mapAttrs (_: value: value.${system})) inputs;
self'.packages.hello = inputs.nixpkgs.legacyPackages.${system}.hello;
pkgs = inputs.nixpkgs.legacyPackages.${system};
inputs'.nixpkgs.packages = pkgs;
inputs'.nixpkgs.legacyPackages = pkgs;
self'.packages = pkgs;
self'.legacyPackages = pkgs;
in
cb: cb { inherit inputs' self'; };

Expand Down
Loading