Unverified Commit e1b8fbad authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 93d9b277 0c23a22c

maintainers/maintainer-list.nix

+13 −7
Original line number Diff line number Diff line
@@ -5448,6 +5448,12 @@ 
    githubId = 62989;

    name = "Demyan Rogozhin";

  };

  Denommus = {

    email = "yuridenommus@gmail.com";

    github = "Denommus";

    githubId = 721022;

    name = "Yuri da Costa Albuquerque";

  };

  denperidge = {

    email = "contact@denperidge.com";

    github = "Denperidge";
@@ -6991,6 +6997,12 @@ 
    githubId = 57543709;

    name = "Chris O'Brien";

  };

  euxane = {

    name = "euxane";

    email = "r9uhdi.nixpkgs@euxane.net";

    github = "pacien";

    githubId = 1449319;

  };

  evalexpr = {

    name = "Jonathan Wilkins";

    email = "nixos@wilkins.tech";
@@ -13665,7 +13677,7 @@ 
  };

  Makuru = {

    email = "makuru@makuru.org";

    github = "makuru-dd";

    github = "makuru-org";

    githubId = 58048293;

    name = "Makuru";

    keys = [ { fingerprint = "5B22 7123 362F DEF1 8F79  BF2B 4792 3A0F EEB5 51C7"; } ];
@@ -17031,12 +17043,6 @@ 
    githubId = 17091659;

    name = "Pablo Andres Dealbera";

  };

  pacien = {

    email = "b4gx3q.nixpkgs@pacien.net";

    github = "pacien";

    githubId = 1449319;

    name = "Pacien Tran-Girard";

  };

  pacman99 = {

    email = "pachum99@gmail.com";

    matrix = "@pachumicchu:myrdd.info";

nixos/modules/programs/msmtp.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ let 


in

{

  meta.maintainers = with lib.maintainers; [ pacien ];

  meta.maintainers = with lib.maintainers; [ euxane ];



  options = {

    programs.msmtp = {

nixos/modules/services/backup/postgresql-wal-receiver.nix

+1 −1
Original line number Diff line number Diff line
@@ -210,5 +210,5 @@ in 
      ) receivers;

    };



  meta.maintainers = with lib.maintainers; [ pacien ];

  meta.maintainers = with lib.maintainers; [ euxane ];

}

nixos/modules/services/mail/stalwart-mail.nix

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ in 
  meta = {

    maintainers = with lib.maintainers; [

      happysalada

      pacien

      euxane

      onny

    ];

  };

nixos/modules/services/matrix/appservice-discord.nix

+1 −1
Original line number Diff line number Diff line
@@ -159,5 +159,5 @@ in 
    };

  };



  meta.maintainers = with lib.maintainers; [ pacien ];

  meta.maintainers = with lib.maintainers; [ euxane ];

}