diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
| commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
| tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix | |
| parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
| parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
| download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip | |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix index 1bfc211d8507..d6593be8890c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -23,8 +23,8 @@ in writeScript "update-${name}" '' set -eux pushd ${basePath} - HOME=`mktemp -d` - cat ${./firefox.key} | gpg --import + export GNUPGHOME=`mktemp -d` + gpg --keyserver hkps://gpg.mozilla.org --recv-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353 tmpfile=`mktemp` url=${baseUrl} @@ -49,7 +49,7 @@ in writeScript "update-${name}" '' curl --silent -o $HOME/shasums "$url$version/SHA512SUMS" curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc" - gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums + gpgv --keyring=$GNUPGHOME/pubring.kbx $HOME/shasums.asc $HOME/shasums # this is a list of sha512 and tarballs for both arches shasums=`cat $HOME/shasums` |