Skip to content

Commit becc648

Browse files
authored
refactor(tests): call from flake.nix (#389)
1 parent 2e2bdec commit becc648

File tree

4 files changed

+37
-42
lines changed

4 files changed

+37
-42
lines changed

dev/flake.nix

+14-5
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,20 @@
5656

5757
checks = forAllSystems (
5858
system:
59-
import ../tests rec {
60-
inherit home-manager home-manager-stable;
61-
inherit (nixpkgs) lib;
62-
nixpkgs = nixpkgsFor.${system}.unstable;
63-
nixpkgs-stable = nixpkgsFor.${system}.stable;
59+
let
60+
pkgs = nixpkgsFor.${system};
61+
inherit (pkgs.unstable) lib;
62+
63+
callUnstable = lib.flip pkgs.unstable.callPackage { inherit home-manager; };
64+
callStable = lib.flip pkgs.stable.callPackage { home-manager = home-manager-stable; };
65+
in
66+
lib.optionalAttrs pkgs.unstable.stdenv.hostPlatform.isDarwin {
67+
darwin-test-unstable = callUnstable ../tests/darwin.nix;
68+
darwin-test-stable = callStable ../tests/darwin.nix;
69+
}
70+
// lib.optionalAttrs pkgs.unstable.stdenv.hostPlatform.isLinux {
71+
nixos-test-unstable = callUnstable ../tests/nixos.nix;
72+
nixos-test-stable = callStable ../tests/nixos.nix;
6473
}
6574
);
6675

tests/darwin.nix

+22-20
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
pkgs,
44
home-manager,
55
}:
6+
67
(home-manager.lib.homeManagerConfiguration {
78
inherit pkgs;
9+
810
modules = [
911
./home.nix
1012

@@ -13,35 +15,35 @@
1315
homeDirectory = "/Users/test";
1416
};
1517

16-
i18n.inputMethod.enabled = lib.mkForce null;
18+
i18n.inputMethod.enabled = lib.mkVMOverride null;
1719

1820
programs = {
19-
cava.enable = lib.mkForce false; # NOTE: this may actually work on darwin, but the package is currently not supported
20-
foot.enable = lib.mkForce false;
21-
fuzzel.enable = lib.mkForce false;
22-
hyprlock.enable = lib.mkForce false;
23-
imv.enable = lib.mkForce false;
24-
mpv.enable = lib.mkForce false; # NOTE: same as cava, but `mpv` fails to build currently
25-
obs-studio.enable = lib.mkForce false;
26-
rio.enable = lib.mkForce false; # marked as broken
27-
rofi.enable = lib.mkForce false;
28-
spotify-player.enable = lib.mkForce false; # NOTE: same as mpv
29-
swaylock.enable = lib.mkForce false;
30-
tofi.enable = lib.mkForce false;
31-
waybar.enable = lib.mkForce false;
21+
cava.enable = lib.mkVMOverride false; # NOTE: this may actually work on darwin, but the package is currently not supported
22+
foot.enable = lib.mkVMOverride false;
23+
fuzzel.enable = lib.mkVMOverride false;
24+
hyprlock.enable = lib.mkVMOverride false;
25+
imv.enable = lib.mkVMOverride false;
26+
mpv.enable = lib.mkVMOverride false; # NOTE: same as cava, but `mpv` fails to build currently
27+
obs-studio.enable = lib.mkVMOverride false;
28+
rio.enable = lib.mkVMOverride false; # marked as broken
29+
rofi.enable = lib.mkVMOverride false;
30+
spotify-player.enable = lib.mkVMOverride false; # NOTE: same as mpv
31+
swaylock.enable = lib.mkVMOverride false;
32+
tofi.enable = lib.mkVMOverride false;
33+
waybar.enable = lib.mkVMOverride false;
3234
};
3335

34-
qt.enable = lib.mkForce false; # NOTE: same as cava
36+
qt.enable = lib.mkVMOverride false; # NOTE: same as cava
3537

3638
services = {
37-
dunst.enable = lib.mkForce false;
38-
mako.enable = lib.mkForce false;
39-
polybar.enable = lib.mkForce false;
39+
dunst.enable = lib.mkVMOverride false;
40+
mako.enable = lib.mkVMOverride false;
41+
polybar.enable = lib.mkVMOverride false;
4042
};
4143

4244
wayland.windowManager = {
43-
hyprland.enable = lib.mkForce false;
44-
sway.enable = lib.mkForce false;
45+
hyprland.enable = lib.mkVMOverride false;
46+
sway.enable = lib.mkVMOverride false;
4547
};
4648
}
4749
];

tests/default.nix

-17
This file was deleted.

tests/nixos.nix

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{ testers, home-manager }:
2+
23
testers.runNixOSTest {
34
name = "module-test";
45

0 commit comments

Comments
 (0)