nixos/opensmtpd: run nixfmt as requested by ci

NixOS · Dec 25, 2024 · 40f9205 · 40f9205
1 parent 0b0a21c
commit 40f9205
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
@@ -113,11 +113,13 @@ in
       source = "${cfg.package}/bin/smtpctl";
     };
 
-    services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail
-      (security.wrappers.smtpctl // {
+    services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail (
+      security.wrappers.smtpctl
+      // {
         source = "${sendmail}/bin/sendmail";
         program = "sendmail";
-      });
+      }
+    );
 
     systemd.tmpfiles.rules = [
       "d /var/spool/smtpd 711 root - - -"

diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
@@ -16,24 +16,26 @@ import ./make-test-python.nix {
             }
           ];
         };
-        environment.systemPackages = let
-          testSendmail = pkgs.writeScriptBin "test-sendmail" ''
-            #!/bin/sh
-            set -euxo pipefail
-            echo "========= SENDING" >&2
-            ${pkgs.system-sendmail}/bin/sendmail -v -f alice@smtp1 bob@smtp2 >&2 <<EOF
-            From: alice@smtp1
-            To: bob@smtp2
-            Subject: Sendmail Test
+        environment.systemPackages =
+          let
+            testSendmail = pkgs.writeScriptBin "test-sendmail" ''
+              #!/bin/sh
+              set -euxo pipefail
+              echo "========= SENDING" >&2
+              ${pkgs.system-sendmail}/bin/sendmail -v -f alice@smtp1 bob@smtp2 >&2 <<EOF
+              From: alice@smtp1
+              To: bob@smtp2
+              Subject: Sendmail Test
 
-            Hello World
-            EOF
-            echo "=========== FINISHED SENDING" >&2
-          '';
-        in [
-          pkgs.opensmtpd
-          testSendmail
-        ];
+              Hello World
+              EOF
+              echo "=========== FINISHED SENDING" >&2
+            '';
+          in
+          [
+            pkgs.opensmtpd
+            testSendmail
+          ];
         services.opensmtpd = {
           enable = true;
           extraServerArgs = [ "-v" ];