git.iko.soy/typeable/nixpkgs
on master help sign in
firefox-esr-68: drop
commit264693f9d7e9f2404f4be879caced3574f8aacd9 authorajs124 <git@ajs124.de> dateThu 10 Sep 2020, 02:06 (6 years ago) parentfbefec0
5 files changed+11−82
pkgs/applications/networking/browsers/firefox/common.nix+10−28 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch−24 pkgs/applications/networking/browsers/firefox/packages.nix−28 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2
pkgs/applications/networking/browsers/firefox/common.nix+10−28
@@ -7,8 +7,8 @@
77, freetype, fontconfig, file, nspr, nss, libnotify
88, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
99, hunspell, libXdamage, libevent, libstartup_notification
10−, libvpx, libvpx_1_8
11−, icu, icu67, libpng, jemalloc, glib
10+, libvpx_1_8
11+, icu67, libpng, jemalloc, glib
1212, autoconf213, which, gnused, cargo, rustc, llvmPackages
1313, rust-cbindgen, nodejs, nasm, fetchpatch
1414, debugBuild ? false
@@ -112,17 +112,13 @@ stdenv.mkDerivation ({
112112 xorg.libXext unzip makeWrapper
113113 libevent libstartup_notification /* cairo */
114114 libpng jemalloc glib
115− nasm
115+ nasm icu67 libvpx_1_8
116116 # >= 66 requires nasm for the AV1 lib dav1d
117117 # yasm can potentially be removed in future versions
118118 # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
119119 # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
120120 nspr nss
121121 ]
122− ++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ]
123− ++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8
124− ++ lib.optional (lib.versionOlder ffversion "78") icu
125− ++ lib.optional (lib.versionAtLeast ffversion "78.0") icu67
126122 ++ lib.optional alsaSupport alsaLib
127123 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
128124 ++ lib.optional gtk3Support gtk3
@@ -132,12 +128,10 @@ stdenv.mkDerivation ({
132128 AVFoundation MediaToolbox CoreLocation
133129 Foundation libobjc AddressBook cups ];
134130
135− NIX_CFLAGS_COMPILE = toString ([
131+ NIX_CFLAGS_COMPILE = toString [
136132 "-I${glib.dev}/include/gio-unix-2.0"
137133 "-I${nss.dev}/include/nss"
138− ]
139− ++ lib.optional (pname == "firefox-esr" && lib.versionOlder ffversion "69")
140− "-Wno-error=format-security");
134+ ];
141135
142136 postPatch = ''
143137 rm -rf obj-x86_64-pc-linux-gnu
@@ -228,16 +222,7 @@ stdenv.mkDerivation ({
228222 "--with-system-nspr"
229223 "--with-system-nss"
230224 ]
231− ++ lib.optionals (lib.versionOlder ffversion "78") [
232− "--with-system-bz2"
233− "--enable-startup-notification"
234− "--disable-gconf"
235− ]
236− ++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite"
237225 ++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks"
238− ++ lib.optionals (lib.versionOlder ffversion "69") [
239− "--enable-webrender=build"
240− ]
241226
242227 ++ flag alsaSupport "alsa"
243228 ++ flag pulseaudioSupport "pulseaudio"
@@ -305,16 +290,13 @@ stdenv.mkDerivation ({
305290 inherit execdir;
306291 inherit browserName;
307292 } // lib.optionalAttrs gtk3Support { inherit gtk3; };
308−} //
309−lib.optionalAttrs (lib.versionAtLeast ffversion "74") {
293+
310294 hardeningDisable = [ "format" ]; # -Werror=format-security
311−} //
312−# the build system verifies checksums of the bundled rust sources
313−# ./third_party/rust is be patched by our libtool fixup code in stdenv
314−# unfortunately we can't just set this to `false` when we do not want it.
315−# See https://github.com/NixOS/nixpkgs/issues/77289 for more details
316295
317−lib.optionalAttrs (lib.versionAtLeast ffversion "72") {
296+ # the build system verifies checksums of the bundled rust sources
297+ # ./third_party/rust is be patched by our libtool fixup code in stdenv
298+ # unfortunately we can't just set this to `false` when we do not want it.
299+ # See https://github.com/NixOS/nixpkgs/issues/77289 for more details
318300 # Ideally we would figure out how to tell the build system to not
319301 # care about changed hashes as we are already doing that when we
320302 # fetch the sources. Any further modifications of the source tree
pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patchdeleted−24
@@ -1,24 +0,0 @@
1−Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
2−diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp
3−--- firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:48:28.988747428 +0100
4−+++ firefox-65.0/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:51:13.378188397 +0100
5−@@ -67,8 +67,6 @@
6− {"about", "chrome://global/content/aboutAbout.xhtml", 0},
7− {"addons", "chrome://mozapps/content/extensions/extensions.xul",
8− nsIAboutModule::ALLOW_SCRIPT},
9−- {"buildconfig", "chrome://global/content/buildconfig.html",
10−- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
11− {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
12− nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
13− nsIAboutModule::ALLOW_SCRIPT},
14−diff -ur firefox-65.0-orig/toolkit/content/jar.mn firefox-65.0/toolkit/content/jar.mn
15−--- firefox-65.0-orig/toolkit/content/jar.mn 2019-01-23 00:48:35.033372506 +0100
16−+++ firefox-65.0/toolkit/content/jar.mn 2019-01-23 00:50:45.126565924 +0100
17−@@ -36,7 +36,6 @@
18− content/global/plugins.css
19− content/global/browser-child.js
20− content/global/browser-content.js
21−-* content/global/buildconfig.html
22− content/global/buildconfig.css
23− content/global/contentAreaUtils.js
24− content/global/datepicker.xhtml
pkgs/applications/networking/browsers/firefox/packages.nix−28
@@ -61,32 +61,4 @@ rec {
6161 versionKey = "ffversion";
6262 };
6363 };
64−
65− firefox-esr-68 = (common rec {
66− pname = "firefox-esr";
67− ffversion = "68.12.0esr";
68− src = fetchurl {
69− url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
70− sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3";
71− };
72−
73− patches = [
74− ./no-buildconfig-ffx65.patch
75− ];
76−
77− meta = firefox.meta // {
78− description = "A web browser built from Firefox Extended Support Release source tree";
79− };
80− updateScript = callPackage ./update.nix {
81− attrPath = "firefox-esr-68-unwrapped";
82− versionSuffix = "esr";
83− versionKey = "ffversion";
84− };
85− }).override {
86− # Mozilla unfortunately doesn't support building with latest NSS anymore;
87− # instead they provide ESR releases for NSS:
88− # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases
89− nss = nss_3_44;
90− };
91−
9264}
pkgs/top-level/aliases.nix+1
@@ -130,6 +130,7 @@ mapAliases ({
130130 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
131131 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
132132 ffadoFull = ffado; # added 2018-05-01
133+ firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs";
133134 firefox-esr-wrapper = firefox-esr; # 2016-01
134135 firefox-wrapper = firefox; # 2016-01
135136 firefoxWrapper = firefox; # 2015-09
pkgs/top-level/all-packages.nix−2
@@ -20539,11 +20539,9 @@ in
2053920539 });
2054020540
2054120541 firefox-unwrapped = firefoxPackages.firefox;
20542− firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68;
2054320542 firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78;
2054420543 firefox = wrapFirefox firefox-unwrapped { };
2054520544 firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; };
20546− firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { };
2054720545 firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { };
2054820546 firefox-esr = firefox-esr-78;
2054920547