git: actually fix things

I'm bad at Nix, apparently

Author: pluiedev

format

@@ -1,5 +1,6 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/6616de389ed55fba6eeba60377fc04732d5a207c.tar.gz -i bash -p git gnugrep gnused findutils nixfmt
+#! nix-shell -i bash -p git gnugrep gnused findutils nixfmt
+#1 nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/6616de389ed55fba6eeba60377fc04732d5a207c.tar.gz -i bash -p git gnugrep gnused findutils nixfmt
 
 nixfmt_args=()
 files=()

modules/programs/git.nix

@@ -489,28 +489,19 @@ in {
     }
 
     (mkIf (cfg.signing != null) {
-      programs.git.iniContent = with cfg.signing;
+      programs.git.iniContent = with cfg;
         let
-          formats = [
-            {
-              format = "openpgp";
-              defaultProgram = "${pkgs.gnupg}/bin/gpg2";
-            }
-            {
-              format = "ssh";
-              defaultProgram = "${pkgs.openssh}/bin/ssh";
-            }
-            {
-              format = "x509";
-              defaultProgram = "${pkgs.gnupg}/bin/gpgsm";
-            }
-          ];
+          formats = {
+            openpgp = "${pkgs.gnupg}/bin/gpg2";
+            ssh = "${pkgs.openssh}/bin/ssh";
+            x509 = "${pkgs.gnupg}/bin/gpgsm";
+          };
         in {
           gpg = {
             format = mkIf (signing.format != null) signing.format;
-          } // lib.genAttrs formats ({ format, defaultProgram, }: {
-            program =
-              mkIf (signing.format == f) signing.program or defaultProgram;
+          } // lib.genAttrs (builtins.attrNames formats) (f: {
+            program = mkIf (signing.format == f)
+              signing.program or (builtins.getAttr f);
           });
 
           user.signingKey = mkIf (signing.key != null) signing.key;

tests/modules/programs/git/git-with-signing-key-id-legacy-expected.conf

@@ -1,12 +1,6 @@
 [commit]
 	gpgSign = true
 
-[gpg]
-	format = "openpgp"
-
-[gpg "openpgp"]
-	program = "path-to-gpg"
-
 [tag]
 	gpgSign = true
 

tests/modules/programs/git/git-with-signing-key-id-legacy.nix

@@ -1,5 +1,10 @@
 { pkgs, ... }: {
   config = {
+    test.asserts.warnings.expected = [''
+      `programs.git.signing.gpgPath` has been deprecated.
+      Please use `programs.git.signing.program` instead.
+    ''];
+
     programs.git = {
       enable = true;
       userName = "John Doe";