Merge master into staging-next

Author: nixpkgs-ci[bot]

maintainers/maintainer-list.nix

@@ -9902,6 +9902,12 @@
     githubId = 155722885;
     name = "Joachim Ernst";
   };
+  hemera = {
+    email = "[email protected]";
+    github = "TheNeikos";
+    githubId = 1631166;
+    name = "Marcel Müller";
+  };
   henkery = {
     email = "[email protected]";
     github = "henkery";
@@ -17298,6 +17304,12 @@
     githubId = 144328493;
     keys = [ { fingerprint = "D89F 440C 6CD7 4753 090F  EC7A 4682 C5CB 4D9D EA3C"; } ];
   };
+  naora = {
+    name = "Joris Gundermann";
+    email = "[email protected]";
+    github = "Naora";
+    githubId = 2221163;
+  };
   naphta = {
     github = "naphta";
     githubId = 6709831;

nixos/tests/all-tests.nix

@@ -768,7 +768,7 @@ in
   lomiri = discoverTests (import ./lomiri.nix);
   lomiri-calculator-app = runTest ./lomiri-calculator-app.nix;
   lomiri-calendar-app = runTest ./lomiri-calendar-app.nix;
-  lomiri-camera-app = runTest ./lomiri-camera-app.nix;
+  lomiri-camera-app = discoverTests (import ./lomiri-camera-app.nix);
   lomiri-clock-app = runTest ./lomiri-clock-app.nix;
   lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
   lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;