Merge master into staging-next

Author: github-actions[bot]

maintainers/maintainer-list.nix

@@ -5448,6 +5448,12 @@
     githubId = 62989;
     name = "Demyan Rogozhin";
   };
+  Denommus = {
+    email = "[email protected]";
+    github = "Denommus";
+    githubId = 721022;
+    name = "Yuri da Costa Albuquerque";
+  };
   denperidge = {
     email = "[email protected]";
     github = "Denperidge";
@@ -6991,6 +6997,12 @@
     githubId = 57543709;
     name = "Chris O'Brien";
   };
+  euxane = {
+    name = "euxane";
+    email = "[email protected]";
+    github = "pacien";
+    githubId = 1449319;
+  };
   evalexpr = {
     name = "Jonathan Wilkins";
     email = "[email protected]";
@@ -13665,7 +13677,7 @@
   };
   Makuru = {
     email = "[email protected]";
-    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 = "[email protected]";
-    github = "pacien";
-    githubId = 1449319;
-    name = "Pacien Tran-Girard";
-  };
   pacman99 = {
     email = "[email protected]";
     matrix = "@pachumicchu:myrdd.info";

nixos/modules/programs/msmtp.nix

@@ -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

@@ -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

@@ -198,7 +198,7 @@ in
   meta = {
     maintainers = with lib.maintainers; [
       happysalada
-      pacien
+      euxane
       onny
     ];
   };

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

@@ -159,5 +159,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ pacien ];
+  meta.maintainers = with lib.maintainers; [ euxane ];
 }

nixos/modules/services/matrix/mautrix-telegram.nix

@@ -200,7 +200,7 @@ in
   };
 
   meta.maintainers = with lib.maintainers; [
-    pacien
+    euxane
     vskilet
   ];
 }

nixos/modules/services/misc/rmfakecloud.nix

@@ -145,5 +145,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ pacien ];
+  meta.maintainers = with lib.maintainers; [ euxane ];
 }

nixos/tests/postgresql/postgresql-wal-receiver.nix

@@ -19,7 +19,7 @@ let
     in
     makeTest {
       name = "postgresql-wal-receiver-${package.name}";
-      meta.maintainers = with lib.maintainers; [ pacien ];
+      meta.maintainers = with lib.maintainers; [ euxane ];
 
       nodes.machine =
         { ... }:

nixos/tests/restic.nix

@@ -132,8 +132,15 @@ import ./make-test-python.nix (
           "cp -rT ${testDir} /opt",
           "touch /opt/excluded_file_1 /opt/excluded_file_2",
           "mkdir -p /root/restic-rclone-backup",
-          "restic-remote-noinit-backup init",
+      )
+
+      server.fail(
+          # test that noinit backup in fact does not initialize the repository
+          # and thus fails without a pre-initialized repository
+          "systemctl start restic-backups-remote-noinit-backup.service",
+      )
 
+      server.succeed(
           # test that remotebackup runs custom commands and produces a snapshot
           "timedatectl set-time '2016-12-13 13:45'",
           "systemctl start restic-backups-remotebackup.service",
@@ -152,7 +159,8 @@ import ./make-test-python.nix (
           "restic-remote-from-file-backup restore latest -t /tmp/restore-2",
           "diff -ru ${testDir} /tmp/restore-2/opt",
 
-          # test that remote-noinit-backup produces a snapshot
+          # test that remote-noinit-backup produces a snapshot once initialized
+          "restic-remote-noinit-backup init",
           "systemctl start restic-backups-remote-noinit-backup.service",
           'restic-remote-noinit-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
 

nixos/tests/stalwart-mail.nix

@@ -123,7 +123,7 @@ import ./make-test-python.nix (
     meta = {
       maintainers = with lib.maintainers; [
         happysalada
-        pacien
+        euxane
         onny
       ];
     };