summary refs log tree commit diff
path: root/pkgs/applications/misc/gpg-mdp
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/applications/misc/gpg-mdp
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/applications/misc/gpg-mdp')
-rw-r--r--pkgs/applications/misc/gpg-mdp/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix
index fe58fa92d07..4143f6fde55 100644
--- a/pkgs/applications/misc/gpg-mdp/default.nix
+++ b/pkgs/applications/misc/gpg-mdp/default.nix
@@ -19,11 +19,11 @@ in stdenv.mkDerivation {
       --replace "alias echo=/bin/echo" ""
 
     substituteInPlace ./src/config.c \
-      --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" \
+      --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \
       --replace "/usr/bin/vi" "vi"
 
     substituteInPlace ./mdp.1 \
-      --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2"
+      --replace "/usr/bin/gpg" "${gnupg}/bin/gpg"
   '';
   # we add symlinks to the binary and man page with the name 'gpg-mdp', in case
   # the completely unrelated program also named 'mdp' is already installed.