From d612e8ab4abcde7f306d3a223dfe41a0d9c61bda Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 6 Jun 2021 13:06:53 +0900 Subject: [PATCH] firefox, firefox-bin: fetch GPG key from keyring (cherry picked from commit 1415289e67cf4a8e0ffd81088d549fbafc93e782) --- .../networking/browsers/firefox-bin/mozilla.asc | Bin 6109 -> 0 bytes .../networking/browsers/firefox-bin/update.nix | 2 +- .../networking/browsers/firefox/update.nix | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox-bin/mozilla.asc diff --git a/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc b/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc deleted file mode 100644 index dc58eb8d56ab023d0f4935641a641f6b01e6ed88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6109 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 E0J%W6ga7~l diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 018bf04cb57..2622295ad87 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -26,7 +26,7 @@ in writeScript "update-${name}" '' HOME=`mktemp -d` export GNUPGHOME=`mktemp -d` - gpg --import ${./mozilla.asc} + gpg --receive-keys 61B7B526D98F0353 tmpfile=`mktemp` url=${baseUrl} diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index b297e9727b0..5bcfe3c8477 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -21,7 +21,7 @@ writeScript "update-${attrPath}" '' set -eux HOME=`mktemp -d` export GNUPGHOME=`mktemp -d` - gpg --import ${../firefox-bin/mozilla.asc} + gpg --receive-keys 61B7B526D98F0353 url=${baseUrl}