diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2021-06-06 13:06:53 +0900 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-18 17:40:15 +0000 |
| commit | d612e8ab4abcde7f306d3a223dfe41a0d9c61bda (patch) | |
| tree | e570ec562675b41ef55e07653bbf8ac5bc5860cc | |
| parent | firefox: fix parameter of update.nix for ESR version (diff) | |
| download | nixpkgs-d612e8ab4abcde7f306d3a223dfe41a0d9c61bda.tar.gz | |
firefox, firefox-bin: fetch GPG key from keyring
(cherry picked from commit 1415289e67cf4a8e0ffd81088d549fbafc93e782)
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/mozilla.asc | bin | 6109 -> 0 bytes | |||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/update.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/update.nix | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc b/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc Binary files differdeleted file mode 100644 index dc58eb8d56ab..000000000000 --- a/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc +++ /dev/null diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 018bf04cb570..2622295ad877 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 b297e9727b0d..5bcfe3c84770 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} |