diff options
| author | github-actions[bot] | 2023-03-04 12:01:17 +0000 |
|---|---|---|
| committer | GitHub | 2023-03-04 12:01:17 +0000 |
| commit | 8480c21d06f64bd43605b6e42c65f0c29d925301 (patch) | |
| tree | 0502ac3803cf224ba821ba30d9cd1cdfdf7cc8b6 /nixos/tests | |
| parent | 8cf8d771214504422e1c961214eb9b941f2e7268 (diff) | |
| parent | 45e44c56f115a33b034f3fcccdec05040438a75a (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/gitea.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/phosh.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index da61abd84e89..a8b5567c2075 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -1,6 +1,6 @@ { system ? builtins.currentSystem, config ? {}, - giteaPackage, + giteaPackage ? pkgs.gitea, pkgs ? import ../.. { inherit system config; } }: diff --git a/nixos/tests/phosh.nix b/nixos/tests/phosh.nix index 25bf4848542e..78d6da31beee 100644 --- a/nixos/tests/phosh.nix +++ b/nixos/tests/phosh.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...}: let in { name = "phosh"; meta = with pkgs.lib.maintainers; { - maintainers = [ zhaofengli ]; + maintainers = [ tomfitzhenry zhaofengli ]; }; nodes = { |