summary refs log tree commit diff
path: root/pkgs/os-specific/linux/tomb/default.nix
diff options
context:
space:
mode:
authorLancelot SIX <lsix@lancelotsix.com>2017-08-10 11:43:48 +0200
committerRobin Gloster <mail@glob.in>2017-08-11 19:24:06 +0200
commite34ce9d1c551fb43742aada6bb43ccb1a52e64a1 (patch)
treee20c090163bad0902265eb5b9d2d7ab28a2b3be5 /pkgs/os-specific/linux/tomb/default.nix
parentd8f08bb088f662a16768ba4e205b2951e0a23bdc (diff)
downloadnixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar
nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.gz
nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.bz2
nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.lz
nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.xz
nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.zst
nixpkgs-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.zip
gnupg: 2.1.22 -> 2.1.23
This release in a RC for gnupg-2.2. The main difference as far as
nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and
`gpgv2` is called `gpgv`.

This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs,
but there might be some packaged software that internally use `gpg2`
not handeled by this commit.

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html
for full release information
Diffstat (limited to 'pkgs/os-specific/linux/tomb/default.nix')
-rw-r--r--pkgs/os-specific/linux/tomb/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index f1347c197bf..2ef5d53b066 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
     install -Dm755 tomb       $out/bin/tomb
     install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1
 
-    # it works fine with gnupg v2, but it looks for an executable named gpg
-    ln -s ${gnupg}/bin/gpg2 $out/bin/gpg
+    ln -s ${gnupg}/bin/gpg $out/bin/gpg
 
     wrapProgram $out/bin/tomb \
       --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]}