summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
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/networking/browsers
parentd8f08bb088f662a16768ba4e205b2951e0a23bdc (diff)
downloadnixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar
nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.gz
nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.bz2
nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.lz
nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.xz
nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.zst
nixlib-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/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/update.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index 3bcc2ab003c1..ac3f7d1380c5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -22,7 +22,7 @@ in writeScript "update-${name}" ''
   pushd ${basePath}
 
   HOME=`mktemp -d`
-  cat ${./firefox.key} | gpg2 --import
+  cat ${./firefox.key} | gpg --import
 
   tmpfile=`mktemp`
   url=${baseUrl}
@@ -47,7 +47,7 @@ in writeScript "update-${name}" ''
 
   curl --silent -o $HOME/shasums "$url$version/SHA512SUMS"
   curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc"
-  gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
+  gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
 
   # this is a list of sha512 and tarballs for both arches
   shasums=`cat $HOME/shasums`