From 1415289e67cf4a8e0ffd81088d549fbafc93e782 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 6 Jun 2021 13:06:53 +0900 Subject: firefox, firefox-bin: fetch GPG key from keyring --- .../networking/browsers/firefox-bin/mozilla.asc | Bin 6109 -> 0 bytes .../networking/browsers/firefox-bin/update.nix | 2 +- pkgs/applications/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 dc58eb8d56ab0..0000000000000 Binary files a/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc and /dev/null differ diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 018bf04cb570f..2622295ad8777 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 b297e9727b0d3..5bcfe3c847709 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} -- cgit 1.4.1