about summary refs log tree commit diff
path: root/modules/user/aszlig/profiles/workstation/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-08-19 12:37:46 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-08-19 12:37:46 +0200
commit3a0f741b9bfcd436bd4157162cd5e48cd3101f79 (patch)
tree03e435de515487053e027c996253d985fd8f13ce /modules/user/aszlig/profiles/workstation/default.nix
parenta1992768d3935bc4b2f0254a42b70a717886f160 (diff)
Rename all occurences of gpg2 to gpg
This is in reaction to upstream commit
NixOS/nixpkgs@e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.

One of the changes in GnuPG 2.1.23 is that the main binary is now called
gpg instead of gpg2. See the full release announcement here:

https://lists.gnupg.org/pipermail/gnupg-announce/2017q3/000412.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/user/aszlig/profiles/workstation/default.nix')
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 793a1727..bce6ea05 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -66,7 +66,7 @@ in {
       user.email = "aszlig@redmoonstudios.org";
       user.name = "aszlig";
       user.signingkey = "4DFD43EC834B6901BDA2BAAC1DE8E48E57DB5436";
-      gpg.program = "${pkgs.gnupg}/bin/gpg2";
+      gpg.program = "${pkgs.gnupg}/bin/gpg";
       push.default = "current";
       tar."tar.xz".command = "${pkgs.xz}/bin/xz -c";
       rebase.autosquash = true;