diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-04 13:25:56 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-10-17 23:16:05 +0000 |
| commit | f82c5d39da91f0cdd749621412b063bfb0ab9bdf (patch) | |
| tree | ebae7861aae6c366d2017ec4ef407b428cddeb24 /nixpkgs/pkgs/applications/networking | |
| parent | 712db37d510eec7fec03000e7ee15c633bb6b64d (diff) | |
| download | nixlib-f82c5d39da91f0cdd749621412b063bfb0ab9bdf.tar nixlib-f82c5d39da91f0cdd749621412b063bfb0ab9bdf.tar.gz nixlib-f82c5d39da91f0cdd749621412b063bfb0ab9bdf.tar.bz2 nixlib-f82c5d39da91f0cdd749621412b063bfb0ab9bdf.tar.lz nixlib-f82c5d39da91f0cdd749621412b063bfb0ab9bdf.tar.xz nixlib-f82c5d39da91f0cdd749621412b063bfb0ab9bdf.tar.zst nixlib-f82c5d39da91f0cdd749621412b063bfb0ab9bdf.zip | |
firefox: 92.0.1 -> 93.0
(cherry picked from commit 7dfcaf5e73feebe12606dbc4c08128af75797fa4)
Diffstat (limited to 'nixpkgs/pkgs/applications/networking')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix | 18 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index eeca26fcaf93..81f826d19a73 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -156,23 +156,6 @@ buildStdenv.mkDerivation ({ sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; }) - # These fix Firefox on sway and other non-Gnome wayland WMs. They should be - # removed whenever the following two patches make it onto a release: - # 1. https://hg.mozilla.org/mozilla-central/rev/51c13987d1b8 - # 2. https://hg.mozilla.org/integration/autoland/rev/3b856ecc00e4 - # This will probably happen in the next point release, but let's be careful - # and double check whether it's working on sway on the next v bump. - ++ lib.optionals (lib.versionAtLeast version "92") [ - (fetchpatch { - url = "https://hg.mozilla.org/integration/autoland/raw-rev/3b856ecc00e4"; - sha256 = "sha256-d8IRJD6ELC3ZgEs1ES/gy2kTNu/ivoUkUNGMEUoq8r8="; - }) - (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/51c13987d1b8"; - sha256 = "sha256-C2jcoWLuxW0Ic+Mbh3UpEzxTKZInljqVdcuA9WjspoA="; - }) - ] - ++ patches; @@ -265,6 +248,7 @@ buildStdenv.mkDerivation ({ # this will run autoconf213 configureScript="$(realpath ./mach) configure" export MOZCONFIG=$(pwd)/mozconfig + export MOZBUILD_STATE_PATH=$(pwd)/mozbuild # Set C flags for Rust's bindgen program. Unlike ordinary C # compilation, bindgen does not invoke $CC directly. Instead it diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 774ac9770afe..2173f62814e7 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - version = "92.0.1"; + version = "93.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "53361c231a4ac93a1808c9ccb29893d85b5e516fe939a770aac7f178abb4f43cbe3571097e5c5bf91b11fd95fc62b61f2aa215a45048357bfc9dad9eabdee9ef"; + sha512 = "b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91"; }; meta = { |