summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-02-12 08:50:03 +0100
committerVladimír Čunát <v@cunat.cz>2022-02-12 08:50:03 +0100
commitf17a7eee8dd8bcc3c08c1557b056accdf0677788 (patch)
treee0c708009eb80681f97ef26cc5fef2945576aae4
parentthunderbird: 91.5.1 -> 91.6.0 (diff)
downloadnixpkgs-f17a7eee8dd8bcc3c08c1557b056accdf0677788.tar.gz
Revert "firefox: 96.0.3 -> 97.0"
This reverts commit 6c4ce75c8b7f26d70067f3a7829f1f26adf2f11a. It needs updated nss; let's do this later (e.g. staging-next-21.11).
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix6
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix4
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index e1ee94463ac2..0648fc2520b9 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -10,7 +10,7 @@
, hunspell, libevent, libstartup_notification
, libvpx
, icu70, libpng, glib, pciutils
-, autoconf213, which, gnused, rustPackages_1_57
+, autoconf213, which, gnused, rustPackages
, rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4
, gtk3, wrapGAppsHook
@@ -95,7 +95,7 @@ let
then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
else "/bin";
- inherit (rustPackages_1_57) rustc cargo;
+ inherit (rustPackages) rustc cargo;
# Darwin's stdenv provides the default llvmPackages version, match that since
# clang LTO on Darwin is broken so the stdenv is not being changed.
@@ -174,8 +174,6 @@ buildStdenv.mkDerivation ({
rm -rf obj-x86_64-pc-linux-gnu
substituteInPlace toolkit/xre/glxtest.cpp \
--replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so'
-
- patchShebangs mach
'';
nativeBuildInputs =
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 0ae962f2551e..03101cc2fd24 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";
- version = "97.0";
+ version = "96.0.3";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186";
+ sha512 = "3dd5fbc96e369d5f4fb3eca778c2bd3e2313d089f867de9fac3556810a797e9b5629ef1b8840fb2f22a18df7de95ea1993eee052f691d861a555cea544b05966";
};
meta = {