From b25037d68b5dda082d6bf3f9440bde4f26244e52 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 24 Aug 2017 01:03:01 +0200
Subject: [PATCH] git: simplify submodule slightly

(cherry picked from commit fed112e497323ddb089aad79ab85a9a60a503942)
---
 modules/programs/git.nix | 42 +++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index fae933d7e..eeab16abd 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -8,29 +8,27 @@ let
 
   toINI = (import ../lib/generators.nix).toINI {};
 
-  signModule = types.submodule (
-    { ... }: {
-      options = {
-        key = mkOption {
-          type = types.str;
-          description = "The default GPG signing key fingerprint.";
-        };
-
-        signByDefault = mkOption {
-          type = types.bool;
-          default = false;
-          description = "Whether commits should be signed by default.";
-        };
-
-        gpgPath = mkOption {
-          type = types.str;
-          default = "${pkgs.gnupg}/bin/gpg2";
-          defaultText = "\${pkgs.gnupg}/bin/gpg2";
-          description = "Path to GnuPG binary to use.";
-        };
+  signModule = types.submodule {
+    options = {
+      key = mkOption {
+        type = types.str;
+        description = "The default GPG signing key fingerprint.";
       };
-    }
-  );
+
+      signByDefault = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether commits should be signed by default.";
+      };
+
+      gpgPath = mkOption {
+        type = types.str;
+        default = "${pkgs.gnupg}/bin/gpg2";
+        defaultText = "\${pkgs.gnupg}/bin/gpg2";
+        description = "Path to GnuPG binary to use.";
+      };
+    };
+  };
 
 in