diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-03-12 14:47:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 14:47:56 +0100 |
| commit | ea8362e315d108db9d6c95d81d7daa57f391150c (patch) | |
| tree | 7337d6620465d7a6138c90b37a563b9e408fb558 /pkgs/applications/networking/browsers/firefox | |
| parent | 8fa5eb488b0c46b6b2c64c5a5e463d409b759e98 (diff) | |
| download | nixlib-ea8362e315d108db9d6c95d81d7daa57f391150c.tar nixlib-ea8362e315d108db9d6c95d81d7daa57f391150c.tar.gz nixlib-ea8362e315d108db9d6c95d81d7daa57f391150c.tar.bz2 nixlib-ea8362e315d108db9d6c95d81d7daa57f391150c.tar.lz nixlib-ea8362e315d108db9d6c95d81d7daa57f391150c.tar.xz nixlib-ea8362e315d108db9d6c95d81d7daa57f391150c.tar.zst nixlib-ea8362e315d108db9d6c95d81d7daa57f391150c.zip | |
firefox: 73.0.1 -> 74.0 (#82276)
https://www.mozilla.org/en-US/firefox/74.0/releasenotes/ Co-authored-by: Daniel Frank <git@danielfrank.net>
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 7c58072d5af4..82f1c267e77c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,11 +94,6 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch ] - ++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch { - # https://phabricator.services.mozilla.com/D60667 - url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66"; - sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p"; - }) ++ patches; @@ -297,6 +292,9 @@ stdenv.mkDerivation ({ inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; } // +lib.optionalAttrs (lib.versionAtLeast ffversion "74") { + hardeningDisable = [ "format" ]; # -Werror=format-security +} // # the build system verifies checksums of the bundled rust sources # ./third_party/rust is be patched by our libtool fixup code in stdenv # unfortunately we can't just set this to `false` when we do not want it. diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d0d3f843152b..cf44639ad573 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "73.0.1"; + ffversion = "74.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9"; + sha512 = "245n2ilfgx3rd0xlxzpg4gcwddcy0cgaqnaf5pwixjx0n8py1imiylwlsbihf70s41cq5q8awckchs287yysr4v6pdfqqbj7s0f02ki"; }; patches = [ |