Merge pull request #40006 from taku0/firefox-bin-59.0.3
firefox, firefox-bin: 59.0.2 -> 59.0.3, firefox-esr: 2.7.3esr -> 52.7.4esr
This commit is contained in:
commit
6ec7291a79
File diff suppressed because it is too large
Load diff
|
@ -1,7 +1,7 @@
|
|||
diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp
|
||||
--- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
|
||||
+++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
|
||||
@@ -40,10 +40,6 @@
|
||||
@@ -36,10 +36,6 @@
|
||||
nsIAboutModule::ALLOW_SCRIPT
|
||||
},
|
||||
{
|
||||
|
@ -20,6 +20,6 @@ diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolk
|
|||
content/global/browser-child.js
|
||||
content/global/browser-content.js
|
||||
-* content/global/buildconfig.html
|
||||
content/global/buildconfig.css
|
||||
content/global/contentAreaUtils.js
|
||||
#ifndef MOZ_FENNEC
|
||||
content/global/customizeToolbar.css
|
||||
content/global/datepicker.xhtml
|
||||
|
|
|
@ -18,10 +18,10 @@ rec {
|
|||
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
version = "59.0.2";
|
||||
version = "60.0";
|
||||
src = fetchurl {
|
||||
url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2";
|
||||
sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv";
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "3ya0rq50cwryza7d56mm3g2h7kayh17vry565qvaq7wsi9gcd4cbjk4z7a1s4bdka0xsxg2l7v0zkaj666nbllky2462svbi8imdhb3";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches ++ [
|
||||
|
@ -39,12 +39,12 @@ rec {
|
|||
};
|
||||
} {};
|
||||
|
||||
firefox-esr = common rec {
|
||||
firefox-esr-52 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "52.7.3esr";
|
||||
version = "52.8.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw";
|
||||
sha512 = "4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches;
|
||||
|
@ -58,6 +58,27 @@ rec {
|
|||
};
|
||||
} {};
|
||||
|
||||
firefox-esr-60 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "60.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "20whvk4spdi4yb3alb492c1jca60p4p70mgj2bypa7r8fgjqn57pyh9rcvnci61asar0zvmlihq46ywzrijm1804iw8c4wmlv7qy8dv";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches ++ [
|
||||
./no-buildconfig.patch
|
||||
];
|
||||
|
||||
meta = firefox.meta // {
|
||||
description = "A web browser built from Firefox Extended Support Release source tree";
|
||||
};
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "firefox-esr-unwrapped";
|
||||
versionSuffix = "esr";
|
||||
};
|
||||
} {};
|
||||
|
||||
} // (let
|
||||
|
||||
commonAttrs = {
|
||||
|
|
|
@ -28,9 +28,5 @@ writeScript "update-${attrPath}" ''
|
|||
sort --version-sort | \
|
||||
tail -n 1`
|
||||
|
||||
source_url=`curl --silent $url$version/SOURCE | grep -o 'https://.*\.tar\.bz2'`
|
||||
|
||||
shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1`
|
||||
|
||||
update-source-version ${attrPath} "$version" "$shasum" "$source_url"
|
||||
update-source-version ${attrPath} "$version"
|
||||
''
|
||||
|
|
|
@ -1,13 +1,6 @@
|
|||
{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }:
|
||||
|
||||
let
|
||||
|
||||
# Fix aarch64 build, shouldn't be needed after 3.35
|
||||
aarch64Patch = fetchurl {
|
||||
url = https://hg.mozilla.org/projects/nss/raw-rev/74e679158d1b;
|
||||
sha256 = "1lhs4h32mb2al3z461yylk227nid769di1pdjr7p0kqm2z1qm3jq";
|
||||
};
|
||||
|
||||
nssPEM = fetchurl {
|
||||
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
|
||||
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
|
||||
|
@ -29,8 +22,6 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
prePatch = ''
|
||||
xz -d < ${nssPEM} | patch -p1
|
||||
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
|
||||
(cd nss && patch -p1 < ${aarch64Patch})
|
||||
'';
|
||||
|
||||
patches =
|
||||
|
|
|
@ -15740,11 +15740,14 @@ with pkgs;
|
|||
});
|
||||
|
||||
firefox-unwrapped = firefoxPackages.firefox;
|
||||
firefox-esr-unwrapped = firefoxPackages.firefox-esr;
|
||||
firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52;
|
||||
firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60;
|
||||
tor-browser-unwrapped = firefoxPackages.tor-browser;
|
||||
|
||||
firefox = wrapFirefox firefox-unwrapped { };
|
||||
firefox-esr = wrapFirefox firefox-esr-unwrapped { };
|
||||
firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { };
|
||||
firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { };
|
||||
firefox-esr = firefox-esr-60;
|
||||
|
||||
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
|
||||
channel = "release";
|
||||
|
|
Loading…
Reference in a new issue