Skip to content

Commit

Permalink
tests/platforms: move out of flake wrappers module
Browse files Browse the repository at this point in the history
These should be set up in a dedicated test file, owned by
`tests/default.nix`.

Also refactored to use `callTest`.
  • Loading branch information
MattSturgeon committed Jan 21, 2025
1 parent 115994f commit 77c78bd
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 51 deletions.
33 changes: 0 additions & 33 deletions flake/wrappers.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,6 @@
defaultSystem = system;
};
};

checks =
{
home-manager-module =
(import ../tests/modules/hm.nix {
inherit pkgs;
inherit (inputs) home-manager;
nixvim = self;
}).activationPackage;
home-manager-extra-files-byte-compiling =
import ../tests/modules/hm-extra-files-byte-compiling.nix
{
inherit pkgs;
inherit (inputs) home-manager;
nixvim = self;
};
}
// pkgs.lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
nixos-module =
(import ../tests/modules/nixos.nix {
inherit system;
inherit (inputs) nixpkgs;
nixvim = self;
}).config.system.build.toplevel;
}
// pkgs.lib.optionalAttrs pkgs.stdenv.isDarwin {
darwin-module =
(import ../tests/modules/darwin.nix {
inherit system;
inherit (inputs) nix-darwin;
nixvim = self;
}).system;
};
};

flake = {
Expand Down
1 change: 1 addition & 0 deletions tests/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ in
# Individual tests can be run using: nix build .#docs.user-configs.tests.<test>
docs-user-configs = linkFarm "user-configs-tests" selfPackages.docs.user-configs.tests;
}
// callTests ./platforms { }
# Tests generated from ./test-sources
# Grouped as a number of link-farms in the form { test-1, test-2, ... test-N }
// callTests ./main.nix { }
7 changes: 3 additions & 4 deletions tests/modules/darwin.nix → tests/platforms/darwin.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
nixvim,
self,
system,
nix-darwin,
}:
nix-darwin.lib.darwinSystem {
self.inputs.nix-darwin.lib.darwinSystem {
modules = [
{
nixpkgs.hostPlatform = system;
Expand All @@ -14,6 +13,6 @@ nix-darwin.lib.darwinSystem {

system.stateVersion = 5;
}
nixvim.nixDarwinModules.nixvim
self.nixDarwinModules.nixvim
];
}
21 changes: 21 additions & 0 deletions tests/platforms/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
callTest,
lib,
stdenv,
}:
let
inherit (stdenv.hostPlatform)
isLinux
isDarwin
;
in
{
home-manager-module = (callTest ./hm.nix { }).activationPackage;
home-manager-extra-files-byte-compiling = callTest ./hm-extra-files-byte-compiling.nix { };
}
// lib.optionalAttrs isLinux {
nixos-module = (callTest ./nixos.nix { }).config.system.build.toplevel;
}
// lib.optionalAttrs isDarwin {
darwin-module = (callTest ./darwin.nix { }).system;
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
nixvim,
self,
pkgs,
home-manager,
}:
let
inherit (self.inputs.home-manager.lib)
homeManagerConfiguration
;

config = {
home = {
username = "nixvim";
Expand Down Expand Up @@ -32,22 +35,22 @@ let
};

homeFilesByteCompilingEnabled =
(home-manager.lib.homeManagerConfiguration {
(homeManagerConfiguration {
inherit pkgs;

modules = [
nixvim.homeManagerModules.nixvim
self.homeManagerModules.nixvim
config
{ programs.nixvim.performance.byteCompileLua.configs = true; }
];
}).config.home-files;

homeFilesByteCompilingDisabled =
(home-manager.lib.homeManagerConfiguration {
(homeManagerConfiguration {
inherit pkgs;

modules = [
nixvim.homeManagerModules.nixvim
self.homeManagerModules.nixvim
config
{ programs.nixvim.performance.byteCompileLua.configs = false; }
];
Expand Down
7 changes: 3 additions & 4 deletions tests/modules/hm.nix → tests/platforms/hm.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
nixvim,
self,
pkgs,
home-manager,
}:
home-manager.lib.homeManagerConfiguration {
self.inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;

modules = [
Expand All @@ -19,6 +18,6 @@ home-manager.lib.homeManagerConfiguration {

programs.home-manager.enable = true;
}
nixvim.homeManagerModules.nixvim
self.homeManagerModules.nixvim
];
}
7 changes: 3 additions & 4 deletions tests/modules/nixos.nix → tests/platforms/nixos.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
nixvim,
nixpkgs,
self,
system,
}:
nixpkgs.lib.nixosSystem {
self.inputs.nixpkgs.lib.nixosSystem {
inherit system;

modules = [
Expand All @@ -18,6 +17,6 @@ nixpkgs.lib.nixosSystem {
enable = true;
};
}
nixvim.nixosModules.nixvim
self.nixosModules.nixvim
];
}

0 comments on commit 77c78bd

Please sign in to comment.