lib/tests: simplify access to default system

This commit is contained in:
Matt Sturgeon
2025-01-17 10:16:10 +00:00
parent 9bf4c9d55b
commit 3172e48dbb
3 changed files with 11 additions and 7 deletions
+3 -1
View File
@@ -27,7 +27,9 @@
{ pkgs, system, ... }:
{
# NOTE: this is the publicly documented flake output we've had for a while
check = pkgs.callPackage ../lib/tests.nix { inherit self; };
check = pkgs.callPackage ../lib/tests.nix {
inherit lib self system;
};
# NOTE: no longer needs to be per-system
helpers = lib.warn "nixvim: `<nixvim>.lib.${system}.helpers` has been moved to `<nixvim>.lib.nixvim` and no longer depends on a specific system" self.lib.nixvim;
+4 -5
View File
@@ -1,11 +1,10 @@
{
self,
pkgs,
lib ? pkgs.lib,
...
system,
lib,
}:
let
defaultPkgs = pkgs;
defaultSystem = system;
# Create a nix derivation from a nixvim executable.
# The build phase simply consists in running the provided nvim binary.
@@ -31,7 +30,7 @@ let
{
name ? null,
pkgs ? null,
system ? defaultPkgs.stdenv.hostPlatform.system,
system ? defaultSystem,
module,
extraSpecialArgs ? { },
}:
+4 -1
View File
@@ -8,10 +8,13 @@
pkgs,
pkgsUnfree,
self,
system,
}:
let
fetchTests = callTest ./fetch-tests.nix { };
test-derivation = callPackage ../lib/tests.nix { inherit self; };
test-derivation = callPackage ../lib/tests.nix {
inherit lib self system;
};
inherit (test-derivation) mkTestDerivationFromNixvimModule;
moduleToTest =