From 5dce139663df9ac46a723e73f5f0975d75735975 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 29 Nov 2024 21:01:24 +0100 Subject: fix(tests::infrastructure): Provide `sysLib` as module argument --- tests/default.nix | 2 ++ tests/infrastructure/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'tests') 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> -- cgit 1.4.1