From e2dd0799a8cf252d4a8b59006f7b43fa536ee3fb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:19:00 +0100
Subject: [PATCH] postgrey: fix submodule syntax

---
 nixos/modules/services/mail/postgrey.nix | 42 +++++++++++++-----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index c6fec566c0be..73f271d2a316 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -10,30 +10,34 @@ with lib; let
   socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port");
 
   inetSocket = with types; {
-    addr = mkOption {
-      type = nullOr string;
-      default = null;
-      example = "127.0.0.1";
-      description = "The address to bind to. Localhost if null";
-    };
-    port = mkOption {
-      type = natural';
-      default = 10030;
-      description = "Tcp port to bind to";
+    options = {
+      addr = mkOption {
+        type = nullOr string;
+        default = null;
+        example = "127.0.0.1";
+        description = "The address to bind to. Localhost if null";
+      };
+      port = mkOption {
+        type = natural';
+        default = 10030;
+        description = "Tcp port to bind to";
+      };
     };
   };
 
   unixSocket = with types; {
-    path = mkOption {
-      type = path;
-      default = "/var/run/postgrey.sock";
-      description = "Path of the unix socket";
-    };
+    options = {
+      path = mkOption {
+        type = path;
+        default = "/var/run/postgrey.sock";
+        description = "Path of the unix socket";
+      };
 
-    mode = mkOption {
-      type = string;
-      default = "0777";
-      description = "Mode of the unix socket";
+      mode = mkOption {
+        type = string;
+        default = "0777";
+        description = "Mode of the unix socket";
+      };
     };
   };