From 6d3163aea47fdb1fe19744e91306a2ea4f602292 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 14 Feb 2025 14:21:52 -0800 Subject: [PATCH] git: change stateVersion check for compatiblity (#6453) Original change was created before 24.11 release. We are in 25.05 now. --- modules/programs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/programs/git.nix b/modules/programs/git.nix index b3cb57c28cfa..ff6f3a23def7 100644 --- a/modules/programs/git.nix +++ b/modules/programs/git.nix @@ -120,8 +120,8 @@ in { format = mkOption { type = types.enum [ "openpgp" "ssh" "x509" ]; defaultText = literalExpression '' - "openpgp" for state version < 24.11, - undefined for state version ≥ 24.11 + "openpgp" for state version < 25.05, + undefined for state version ≥ 25.05 ''; description = '' The signing method to use when signing commits and tags. @@ -490,7 +490,7 @@ in { (mkIf (cfg.signing != { }) { programs.git = { signing = { - format = mkIf (versionOlder config.home.stateVersion "24.11") + format = mkIf (versionOlder config.home.stateVersion "25.05") (mkOptionDefault "openpgp"); signer = mkIf (cfg.signing.format != null) (mkOptionDefault { openpgp = getExe config.programs.gpg.package;