public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #127383: firefox*: 89.0 -> 89.0.1 (into release-21.05)

Browse Source
This commit is contained in:
Vladimír Čunát 2021-06-27 09:42:16 +02:00
commit a58ab1cef0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
6 changed files with 408 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pkgs/applications/networking/browsers/firefox-bin/mozilla.asc
View File

Binary file not shown.

778
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/applications/networking/browsers/firefox-bin/update.nix
View File

@ -26,7 +26,7 @@ in writeScript "update-${name}" ''
HOME=`mktemp -d` HOME=`mktemp -d`
export GNUPGHOME=`mktemp -d` export GNUPGHOME=`mktemp -d`
gpg --import ${./mozilla.asc} gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353
tmpfile=`mktemp` tmpfile=`mktemp`
url=${baseUrl} url=${baseUrl}

5
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "89.0"; ffversion = "89.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "5089720feda15d054d0aa4c3bdeb84760314dadd6381d7360e688d8e396154868220c6315add650d8d2a42652cb8a9bfeb833885812ef0bd70a74ee58ad18aa3"; sha512 = "67da387b3b6c5a110c83208f9a15d6064adf423bbebfb0fcad2d85f6c4b615b27da0cbd5486b817f0d5e040bc3e70d74d9af72599b24384397fef1dd153bd3f3";
}; };
meta = { meta = {
@ -51,6 +51,7 @@ rec {
tests = [ nixosTests.firefox-esr ]; tests = [ nixosTests.firefox-esr ];
updateScript = callPackage ./update.nix { updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-78-unwrapped"; attrPath = "firefox-esr-78-unwrapped";
versionSuffix = "esr";
versionKey = "ffversion"; versionKey = "ffversion";
}; };
}; };

16
pkgs/applications/networking/browsers/firefox/update.nix
View File

@ -6,6 +6,7 @@
, gnused , gnused
, gnugrep , gnugrep
, curl , curl
, gnupg
, attrPath , attrPath
, runtimeShell , runtimeShell
, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
@ -15,7 +16,12 @@
writeScript "update-${attrPath}" '' writeScript "update-${attrPath}" ''
#!${runtimeShell} #!${runtimeShell}
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnupg gnused xidel ]}
set -eux
HOME=`mktemp -d`
export GNUPGHOME=`mktemp -d`
gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353
url=${baseUrl} url=${baseUrl}
@ -31,5 +37,11 @@ writeScript "update-${attrPath}" ''
sort --version-sort | \ sort --version-sort | \
tail -n 1` tail -n 1`
update-source-version ${attrPath} "$version" "" "" --version-key=${versionKey} curl --silent --show-error -o "$HOME"/shasums "$url$version/SHA512SUMS"
curl --silent --show-error -o "$HOME"/shasums.asc "$url$version/SHA512SUMS.asc"
gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums
hash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)
update-source-version ${attrPath} "$version" "$hash" "" --version-key=${versionKey}
'' ''

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -335,7 +335,7 @@ stdenv.mkDerivation rec {
attrPath = "thunderbird-78"; attrPath = "thunderbird-78";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
inherit writeScript lib common-updater-scripts xidel coreutils gnused inherit writeScript lib common-updater-scripts xidel coreutils gnused
gnugrep curl runtimeShell; gnugrep gnupg curl runtimeShell;
}; };
requiredSystemFeatures = [ "big-parallel" ]; requiredSystemFeatures = [ "big-parallel" ];