diff options
Diffstat (limited to '')
| -rw-r--r-- | flake/default.nix | 2 | ||||
| -rw-r--r-- | tests/default.nix | 2 | ||||
| -rw-r--r-- | tests/infrastructure/default.nix | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/flake/default.nix b/flake/default.nix index ded656e7..16ae52c6 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -61,7 +61,7 @@ }; tests = import ../tests { - inherit pkgs nixpkgs_as_input myPkgs; + inherit pkgs nixpkgs_as_input myPkgs sysLib; inherit (pkgs) lib; extraModules = { termfilechooser = "${nixpkgs_open_prs.nixpkgs-tfc}/nixos/modules/config/xdg/portals/termfilechooser.nix"; diff --git a/tests/default.nix b/tests/default.nix index 1f2ea049..24b6fa65 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -3,6 +3,7 @@ pkgs, myPkgs, nixpkgs_as_input, + sysLib, extraModules, }: let nixLib = import ../lib {}; @@ -14,6 +15,7 @@ nixos-lib myPkgs extraModules + sysLib ; }; diff --git a/tests/infrastructure/default.nix b/tests/infrastructure/default.nix index 64a6ad01..0e0408e7 100644 --- a/tests/infrastructure/default.nix +++ b/tests/infrastructure/default.nix @@ -4,6 +4,7 @@ lib, nixos-lib, extraModules, + sysLib, ... }: { name, @@ -19,7 +20,7 @@ nixos-lib.runTest { node = { specialArgs = { - inherit myPkgs; + inherit myPkgs sysLib; }; # Use the nixpkgs as constructed by the `nixpkgs.*` options pkgs = null; @@ -82,7 +83,7 @@ nixos-lib.runTest { ''}") machine.succeed("sudo -u soispha ${pkgs.writeShellScript "mkGoldenRecord" '' - set -ex + set -e # HACK: Prevent zsh from complaining about missing configuration. # TODO: These tests should probably just run under bash. <2024-11-22> |