From 86bb69b0b1e10d99a30c4352f230f03106dd0f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Thu, 2 Mar 2023 12:45:46 +0100
Subject: [PATCH] [backport 22.11] gpg: allow unsigned tags (#3730)

(cherry picked from commit d331cceec7cc05061a3c6073eee06c4dba9cf5d3)

Co-authored-by: Sylvain Fankhauser <sephi@fhtagn.top>
---
 modules/programs/git.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 2b0d8a2f1..7dc1721f4 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -458,8 +458,8 @@ in {
     (mkIf (cfg.signing != null) {
       programs.git.iniContent = {
         user.signingKey = mkIf (cfg.signing.key != null) cfg.signing.key;
-        commit.gpgSign = cfg.signing.signByDefault;
-        tag.gpgSign = cfg.signing.signByDefault;
+        commit.gpgSign = mkDefault cfg.signing.signByDefault;
+        tag.gpgSign = mkDefault cfg.signing.signByDefault;
         gpg.program = cfg.signing.gpgPath;
       };
     })