diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-01-09 01:06:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 01:06:59 +0100 |
| commit | b5feb96cb577983acbaa02110be32822c613c07d (patch) | |
| tree | 1c8dab3b048d8f1299f33f18226132442eb85d86 | |
| parent | 568fd9c1917ec0918ddde79be85513af6a991120 (diff) | |
| parent | b4983fe20be4bd1ec1341a198e02ee111f0e6393 (diff) | |
| download | nixpkgs-b5feb96cb577983acbaa02110be32822c613c07d.tar nixpkgs-b5feb96cb577983acbaa02110be32822c613c07d.tar.gz nixpkgs-b5feb96cb577983acbaa02110be32822c613c07d.tar.bz2 nixpkgs-b5feb96cb577983acbaa02110be32822c613c07d.tar.lz nixpkgs-b5feb96cb577983acbaa02110be32822c613c07d.tar.xz nixpkgs-b5feb96cb577983acbaa02110be32822c613c07d.tar.zst nixpkgs-b5feb96cb577983acbaa02110be32822c613c07d.zip | |
Merge pull request #77346 from andir/firefox72
firefox: 72.0 -> 72.0.1
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1896f9d690e..740d05ba046 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -373,5 +373,12 @@ stdenv.mkDerivation (rec { # unfortunately we can't just set this to `false` when we do not want it. # See https://github.com/NixOS/nixpkgs/issues/77289 for more details lib.optionalAttrs (lib.versionAtLeast ffversion "72") { + # Ideally we would figure out how to tell the build system to not + # care about changed hashes as we are already doing that when we + # fetch the sources. Any further modifications of the source tree + # is on purpose by some of our tool (or by accident and a bug?). dontFixLibtool = true; + + # on aarch64 this is also required + dontUpdateAutotoolsGnuConfigScripts = true; }) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2e96df858c8..0032e607ec8 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -16,10 +16,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "72.0"; + ffversion = "72.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3ri375myxn040avylz3xdvbgyb0ixn0q1sszrsc4b9jp620j1732qixylw0lyfym5a0vkhpmihbp5kdjrmc4r26myjar5c9zjzisnd0"; + sha512 = "37ryimi6yfpcha4c9mcv8gjk38kia1lr5xrj2lglwsr1jai7qxrcd8ljcry8bg87qfwwb9fa13prmn78f5pzpxr7jf8gnsbvr6adxld"; }; patches = [ @@ -99,10 +99,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.4.0esr"; + ffversion = "68.4.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "29h0fm929jrk9nbb40bajf6a6s4x9w8zc2qw1hrg5jki1pabx30wdgn372pb51ak371a0q59k8p1vab6j31q7par6xvpwh7aiydfq04"; + sha512 = "3nqchvyr95c9xvz23z0kcqqyx8lskw0lxa3rahiagc7b71pnrk8l40c7327q1wd4y5g16lix0fg04xiy6lqjfycjsrjlfr2y6b51n4d"; }; patches = [ |