cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #94421: firefox* updates (security)

Browse source
This commit is contained in:
Vladimír Čunát 2020-08-01 13:14:00 +02:00
commit 508a5f447e
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
3 changed files with 421 additions and 391 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

770
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

38
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "78.0.1";
ffversion = "79.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "mdO6masIpiZBvYi6kpYUTSnsOda04CUs2CL1LNf1Yad+rfY4ga4aFuLtfKqfgV5IcIIl86XeiC+0grd4irbCYg==";
sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r";
};
patches = [
@ -33,12 +33,40 @@ rec {
};
};
firefox-esr-68 = (common rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
ffversion = "68.10.0esr";
ffversion = "78.1.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "xcGDNWA2SFHnz46lFlm8T7YCOblgElzbIP4x90LXV//a748xT4ANyRIU7o41gDPcKvlxwIu7pHTvYVixAYgWUw==";
sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa";
};
patches = [
./no-buildconfig-ffx76.patch
];
meta = {
description = "A web browser built from Firefox Extended Support Release source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [ eelco andir ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
license = lib.licenses.mpl20;
};
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-78-unwrapped";
versionKey = "ffversion";
};
};
firefox-esr-68 = (common rec {
pname = "firefox-esr";
ffversion = "68.11.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx";
};
patches = [

4
pkgs/top-level/all-packages.nix
View file

@ -20087,10 +20087,12 @@ in
firefox-unwrapped = firefoxPackages.firefox;
firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68;
firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78;
firefox = wrapFirefox firefox-unwrapped { };
firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; };
firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { };
firefox-esr = firefox-esr-68;
firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { };
firefox-esr = firefox-esr-78;
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
channel = "release";