firefox: 59.0.3 -> 60.0

This commit is contained in:
taku0 2018-05-11 09:09:36 +09:00
parent e39706ce49
commit 38bf731db4
3 changed files with 9 additions and 14 deletions

View file

@ -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

View file

@ -1,5 +1,4 @@
{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchzip
, fetchFromGitHub, fetchpatch }:
{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
let
@ -19,10 +18,10 @@ rec {
firefox = common rec {
pname = "firefox";
version = "59.0.3";
src = fetchzip {
url = "https://hg.mozilla.org/releases/mozilla-release/archive/6b51784853e47e091d213d421a19cb623af718f0.tar.bz2";
sha512 = "0wcvs0lzdddbrxp8prg1w1g4xq9xqzvqlgs9r22zjblfnp703nw82zr09ys7jd63mr77g3rgglhi3d5k42aqrbmsx1r5dn5qqf5jlkz";
version = "60.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "3ya0rq50cwryza7d56mm3g2h7kayh17vry565qvaq7wsi9gcd4cbjk4z7a1s4bdka0xsxg2l7v0zkaj666nbllky2462svbi8imdhb3";
};
patches = nixpkgsPatches ++ [

View file

@ -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"
''