diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-11 12:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 12:00:58 +0000 |
| commit | 652204165dd39420b8662b82d311e511b3ec0d99 (patch) | |
| tree | a3d500109f20eb84d5327d7746811c94f124a3b2 /nixos | |
| parent | 49ab0c849ed774db4af45b83552a60d24c6966a0 (diff) | |
| parent | 51c7e38b94873aa240803c5c29add72d18a57514 (diff) | |
| download | nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.gz nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.bz2 nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.lz nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.xz nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.zst nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/pleroma.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/systemd-networkd.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index e9db7f3eab8..89e64d36c8a 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -146,6 +146,6 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ ninjatrappeur ]; + meta.maintainers = with lib.maintainers; [ picnoir ]; meta.doc = ./pleroma.md; } diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 6c423f4140b..6b241b93d51 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -65,7 +65,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { in import ./make-test-python.nix ({pkgs, ... }: { name = "networkd"; meta = with pkgs.lib.maintainers; { - maintainers = [ ninjatrappeur ]; + maintainers = [ picnoir ]; }; nodes = { node1 = { pkgs, ... }@attrs: |