pyrox.dev
Merge pull request #269244 from mweinelt/firefox-121.0b2
firefox-{beta,devedition}-unwrapped: 120.0b9 -> 121.0b3
authored by Martin Weinelt and committed by GitHub 3a65a71f b4d76b8d
+2
-1
pkgs/applications/networking/browsers/firefox/common.nix
+2
-1
pkgs/applications/networking/browsers/firefox/common.nix
···
254
254
]
255
255
++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch
256
256
++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch
257
-
++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch
257
+
++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch
258
+
++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch
258
259
++ extraPatches;
259
260
260
261
postPatch = ''
+27
pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch
+27
pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch
···
1
+
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
2
+
index cfbc39527b02..9327631a79c5 100644
3
+
--- a/docshell/base/nsAboutRedirector.cpp
4
+
+++ b/docshell/base/nsAboutRedirector.cpp
5
+
@@ -88,9 +88,6 @@ static const RedirEntry kRedirMap[] = {
6
+
{"about", "chrome://global/content/aboutAbout.html", 0},
7
+
{"addons", "chrome://mozapps/content/extensions/aboutaddons.html",
8
+
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
9
+
- {"buildconfig", "chrome://global/content/buildconfig.html",
10
+
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
11
+
- nsIAboutModule::IS_SECURE_CHROME_UI},
12
+
{"checkerboard", "chrome://global/content/aboutCheckerboard.html",
13
+
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
14
+
nsIAboutModule::ALLOW_SCRIPT},
15
+
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
16
+
index ed7c2ad3fc30..ff54456a6582 100644
17
+
--- a/toolkit/content/jar.mn
18
+
+++ b/toolkit/content/jar.mn
19
+
@@ -41,8 +41,6 @@ toolkit.jar:
20
+
content/global/aboutUrlClassifier.js
21
+
content/global/aboutUrlClassifier.xhtml
22
+
content/global/aboutUrlClassifier.css
23
+
-* content/global/buildconfig.html
24
+
- content/global/buildconfig.css
25
+
content/global/contentAreaUtils.js
26
+
content/global/datepicker.xhtml
27
+
#ifndef MOZ_FENNEC
+6
-4
pkgs/applications/networking/browsers/firefox/packages.nix
+6
-4
pkgs/applications/networking/browsers/firefox/packages.nix
···
30
30
31
31
firefox-beta = buildMozillaMach rec {
32
32
pname = "firefox-beta";
33
-
version = "120.0b9";
33
+
version = "121.0b3";
34
34
applicationName = "Mozilla Firefox Beta";
35
35
src = fetchurl {
36
36
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
37
-
sha512 = "7ac5562ce393ea84663eac5c6ee1a0ca527ff4a8a9ec6aaaef37213ff071076846949e80af21d95ec8e32d3cbc740b772a9d7cc54965b7bbc8e015da22ae927f";
37
+
sha512 = "95dd68c50af5784c44e40ad3a8ac6b4fb259fa8f56bc5e5de940d03dec1838b143712680826b4d260fefdad314464d24679911f21b1095512a86cdf4eb2648c9";
38
38
};
39
39
40
40
meta = {
41
+
changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";
41
42
description = "A web browser built from Firefox Beta Release source tree";
42
43
homepage = "http://www.mozilla.com/en-US/firefox/";
43
44
maintainers = with lib.maintainers; [ jopejoe1 ];
···
58
59
59
60
firefox-devedition = buildMozillaMach rec {
60
61
pname = "firefox-devedition";
61
-
version = "120.0b9";
62
+
version = "121.0b3";
62
63
applicationName = "Mozilla Firefox Developer Edition";
63
64
requireSigning = false;
64
65
branding = "browser/branding/aurora";
65
66
src = fetchurl {
66
67
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
67
-
sha512 = "07bf1a58550e70c683719adef55fa3d1ee06876e0cb086c28242879c683269c4aa784b1dce639218b3ad24a546192088fe5224a52e13a0086f205ec5470e2428";
68
+
sha512 = "a5ed25159e63122f27bd05810eaf665834022ae407c029734ad41ef1ed5e3956497873f5210b7c385245056718837bd17c47cfc2e2e438a4c3274d2462ce51f8";
68
69
};
69
70
70
71
meta = {
72
+
changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";
71
73
description = "A web browser built from Firefox Developer Edition source tree";
72
74
homepage = "http://www.mozilla.com/en-US/firefox/";
73
75
maintainers = with lib.maintainers; [ jopejoe1 ];
+2
-2
pkgs/development/libraries/nss/latest.nix
+2
-2
pkgs/development/libraries/nss/latest.nix
···
5
5
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
6
6
7
7
import ./generic.nix {
8
-
version = "3.94";
9
-
hash = "sha256-RjrhgO6eXunjrU9ikyZlfiNngMyGVXKpMKFlIKutndg=";
8
+
version = "3.95";
9
+
hash = "sha256-RpiI5B6KeABRzgDtzZFOimvTjaiKgs+4SJjdOIY1gio=";
10
10
}