Skip to content

Commit 4e9ddbc

Browse files
authored
Update all Firefox/Thunderbird packages (#352161)
2 parents 2fcea20 + bfef141 commit 4e9ddbc

File tree

10 files changed

+1541
-1529
lines changed

10 files changed

+1541
-1529
lines changed

pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix

Lines changed: 413 additions & 413 deletions
Large diffs are not rendered by default.

pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix

Lines changed: 413 additions & 413 deletions
Large diffs are not rendered by default.

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix

Lines changed: 413 additions & 413 deletions
Large diffs are not rendered by default.

pkgs/applications/networking/browsers/firefox/common.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ buildStdenv.mkDerivation {
234234
"profilingPhase"
235235
];
236236

237-
patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]
237+
patches = lib.optionals (lib.versionAtLeast version "111" && lib.versionOlder version "133") [ ./env_var_for_system_dir-ff111.patch ]
238+
++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ]
238239
++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
239240
++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
240241
++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
2+
index 6db876975187..5882c5d7f1d6 100644
3+
--- a/toolkit/xre/nsXREDirProvider.cpp
4+
+++ b/toolkit/xre/nsXREDirProvider.cpp
5+
@@ -11,6 +11,7 @@
6+
7+
#include "jsapi.h"
8+
#include "xpcpublic.h"
9+
+#include "prenv.h"
10+
#include "prprf.h"
11+
12+
#include "nsIAppStartup.h"
13+
@@ -297,7 +297,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
14+
"/usr/lib/mozilla"_ns
15+
# endif
16+
;
17+
- rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir));
18+
+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
19+
+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), getter_AddRefs(localDir));
20+
# endif
21+
22+
if (NS_SUCCEEDED(rv)) {

pkgs/applications/networking/browsers/firefox/packages.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
{
66
firefox = buildMozillaMach rec {
77
pname = "firefox";
8-
version = "131.0.3";
8+
version = "132.0";
99
src = fetchurl {
1010
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
11-
sha512 = "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce";
11+
sha512 = "254ffba16d6e6c61cffaa8131f81a9a78880e5723b7ee78ac36251a27d82e6ff088238ae289d07469ba3a51b5b5969a08ecd1fc02dcb4d93325a08fac1cfc916";
1212
};
1313

1414
extraPatches = [
@@ -35,11 +35,11 @@
3535

3636
firefox-beta = buildMozillaMach rec {
3737
pname = "firefox-beta";
38-
version = "132.0b9";
38+
version = "133.0b1";
3939
applicationName = "Mozilla Firefox Beta";
4040
src = fetchurl {
4141
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
42-
sha512 = "0c491e2a601d6989c10cdd757c83453e07454113dac8e4de154df04386fc0797ee5146dcdc8ca904692a6cb87246b54a4f5e93057afd20f23701abd3f61a6985";
42+
sha512 = "c4a85a72b2891c5b6c6e200cd7ef13abe0f5ad090f8ef1d8243a489791f3542b2cd390c141118c4745c4ca677d1e9bf1e564e4a45e066d27ed53e6bd92844727";
4343
};
4444

4545
meta = {
@@ -64,13 +64,13 @@
6464

6565
firefox-devedition = buildMozillaMach rec {
6666
pname = "firefox-devedition";
67-
version = "132.0b9";
67+
version = "133.0b1";
6868
applicationName = "Mozilla Firefox Developer Edition";
6969
requireSigning = false;
7070
branding = "browser/branding/aurora";
7171
src = fetchurl {
7272
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
73-
sha512 = "3393bb677c6e735860ef49c837ffab10720c6eb47d6cfb6c7960267e3676c69c8293b5f7e49de3f91b6eb88fa4780300db2b2653dde1ae38d546f473bca7e34b";
73+
sha512 = "dced4aba71b07b68ee31c283945e7d62a7032f08f5cf71aa261fc7ba32f58277acbe9fdbdd28777d7f4b824e411815b069cab0ce791438088c9ad19c3d2de62e";
7474
};
7575

7676
meta = {
@@ -96,10 +96,10 @@
9696

9797
firefox-esr-128 = buildMozillaMach rec {
9898
pname = "firefox";
99-
version = "128.3.1esr";
99+
version = "128.4.0esr";
100100
src = fetchurl {
101101
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
102-
sha512 = "c5c1a2e951e0dbb1259a0f77a26b8678bfa4a4c7e909f8fcd5c6d0f807625926824ed235e114d9bab5e289232efaaf4c6691764db64860161ebc9bece9200f0c";
102+
sha512 = "e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3";
103103
};
104104

105105
meta = {

pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix

Lines changed: 265 additions & 265 deletions
Large diffs are not rendered by default.

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,9 @@ let
5555
in rec {
5656
thunderbird = thunderbird-128;
5757

58-
thunderbird-115 = common {
59-
version = "115.16.0esr";
60-
sha512 = "1c70050a773c92593dca2a34b25e9e6edcef6fbb9b081024e4dba024450219e06aace52d9fb90ccc2e8069b7bba0396258c86cc19848a7ac705b42641f6e36a5";
61-
62-
updateScript = callPackage ./update.nix {
63-
attrPath = "thunderbirdPackages.thunderbird-115";
64-
versionPrefix = "115";
65-
versionSuffix = "esr";
66-
};
67-
};
68-
6958
thunderbird-128 = common {
70-
version = "128.3.1esr";
71-
sha512 = "9fef04a0c498eb16688c141cb7d45e803ecc75ea6fc6117ff8ad1e6b049716f49b435f3e5a1baa703fa937e25483137e22256e58572eeacf317de264b961ba6a";
59+
version = "128.4.0esr";
60+
sha512 = "ad031b3a9b738598358cead23cf8438435016222cd9a474c31892dc1b3db43d2d5d3a10c9639df770dc76eb3c0bc9db8be8beab84828d54ee50fc1e03f0da0a5";
7261

7362
updateScript = callPackage ./update.nix {
7463
attrPath = "thunderbirdPackages.thunderbird-128";
@@ -79,5 +68,6 @@ in rec {
7968
}
8069
// lib.optionalAttrs config.allowAliases {
8170
thunderbird-102 = throw "Thunderbird 102 support ended in September 2023";
71+
thunderbird-115 = throw "Thunderbird 115 support ended in October 2024";
8272
}
8373

pkgs/development/libraries/nss/latest.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
66

77
import ./generic.nix {
8-
version = "3.105";
9-
hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ=";
8+
version = "3.106";
9+
hash = "sha256-j8B5RgEdBbtqPmIUniNF8ToGPIrPJ8gVTMplcv72fD0=";
1010
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32668,7 +32668,6 @@ with pkgs;
3266832668
thunderbird-unwrapped = thunderbirdPackages.thunderbird;
3266932669
thunderbird = wrapThunderbird thunderbird-unwrapped { };
3267032670

32671-
thunderbird-115 = wrapThunderbird thunderbirdPackages.thunderbird-115 { };
3267232671
thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { };
3267332672

3267432673
thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped {

0 commit comments

Comments
 (0)