diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-22 06:01:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 06:01:32 +0000 |
| commit | 9c36f57e917cbc40acad7dd30492fd3042692197 (patch) | |
| tree | 476ed1636676c0d1f83e3e0506bb83697328d3bf /nixos | |
| parent | f9a1de8cf2e92e53cc5a6b00535e23c44ec8e59b (diff) | |
| parent | fe2b7d6a922c875221671df6aa360b6e73d47e2f (diff) | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/caddy.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/radicale.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index 41d8e57de4686..0efe8f94e39dd 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "caddy"; meta = with pkgs.lib.maintainers; { - maintainers = [ xfix Br1ght0ne ]; + maintainers = [ Br1ght0ne ]; }; nodes = { diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index 66650dce4a008..868b28085a675 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -6,7 +6,7 @@ let port = "5232"; filesystem_folder = "/data/radicale"; - cli = "${pkgs.calendar-cli}/bin/calendar-cli --caldav-user ${user} --caldav-pass ${password}"; + cli = "${lib.getExe pkgs.calendar-cli} --caldav-user ${user} --caldav-pass ${password}"; in { name = "radicale3"; meta.maintainers = with lib.maintainers; [ dotlambda ]; |