From bf881d4dfce6d27a9c9ac230cbb5e8a2d8319e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Jul 2024 19:33:59 +0200 Subject: [PATCH 1/3] thunderbird: refactor (prepare for version 128) (cherry picked from commit dd0e1ee3fd55f482ff6be034101723b8ed3bdd6c) --- .../mailreaders/thunderbird/packages.nix | 27 ++++++++++++------- .../mailreaders/thunderbird/update.nix | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index ddf6f07e4daa8..ce803e29ceeab 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,17 +1,15 @@ { stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu, fetchpatch2, config }: -rec { - thunderbird = thunderbird-115; - - thunderbird-115 = (buildMozillaMach rec { +let + common = { version, sha512, updateScript }: (buildMozillaMach rec { pname = "thunderbird"; - version = "115.12.2"; + inherit version updateScript; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "182f35e8e5ece98d18dfefe106c73bc97fbc619f59772d9b3455b7c8af412021ecc5eae97a12515224e91deb814abb7a6ef7f538c450e9e77fdfd84078678038"; + inherit sha512; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -30,10 +28,6 @@ rec { # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = licenses.mpl20; }; - updateScript = callPackage ./update.nix { - attrPath = "thunderbird-unwrapped"; - versionPrefix = "115"; - }; }).override { geolocationSupport = false; webrtcSupport = false; @@ -51,6 +45,19 @@ rec { })]; }); }; + +in rec { + thunderbird = thunderbird-115; + + thunderbird-115 = common { + version = "115.12.2"; + sha512 = "182f35e8e5ece98d18dfefe106c73bc97fbc619f59772d9b3455b7c8af412021ecc5eae97a12515224e91deb814abb7a6ef7f538c450e9e77fdfd84078678038"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-115"; + versionPrefix = "115"; + }; + }; } // lib.optionalAttrs config.allowAliases { thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/update.nix b/pkgs/applications/networking/mailreaders/thunderbird/update.nix index d6f1a007faa47..c7f2e0511d241 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/update.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/update.nix @@ -3,5 +3,5 @@ }@args: callPackage ../../browsers/firefox/update.nix ({ - baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; + baseUrl = "https://archive.mozilla.org/pub/thunderbird/releases/"; } // (builtins.removeAttrs args ["callPackage"])) From bbb1dc5692414c909cd7c37dd6990df84fd212e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Jul 2024 19:34:52 +0200 Subject: [PATCH 2/3] thunderbird-128: init at 128.0esr https://blog.thunderbird.net/2024/07/welcome-to-thunderbird-128-nebula/ (cherry picked from commit 22601be95cba9652b9f8fce48580a1924e53cd5f) --- .../networking/mailreaders/thunderbird/packages.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index ce803e29ceeab..d0c40bc8b5be0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -58,6 +58,17 @@ in rec { versionPrefix = "115"; }; }; + + thunderbird-128 = common { + version = "128.0esr"; + sha512 = "8524fbdcc51eddf83fec439273319315c44e6d3be9e4dcf51e453ced7fd1676abdca44442dcb302c637a98b7873828168f2d2d2b635551e406645a134d09aee0"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-128"; + versionPrefix = "128"; + versionSuffix = "esr"; + }; + }; } // lib.optionalAttrs config.allowAliases { thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51d3f3925927f..5b16f0f996fc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34807,6 +34807,8 @@ with pkgs; thunderbird-unwrapped = thunderbirdPackages.thunderbird; thunderbird = wrapThunderbird thunderbird-unwrapped { }; + thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { }; + thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped { applicationName = "thunderbird"; pname = "thunderbird-bin"; From 329522d875ffcc5d280469fd1f4d442f05d066cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 15 Jul 2024 08:43:49 +0200 Subject: [PATCH 3/3] thunderbird: cleanup patch filenames - drop old no-buildconfig.patch, forgotten from thunderbird 102 - rename the -115 version to no-buildconfig.patch (without changes) (cherry picked from commit 37a7071f1523e939f7b93da90167ea21d9dbd7df) --- .../thunderbird/no-buildconfig-115.patch | 13 ------------- .../mailreaders/thunderbird/no-buildconfig.patch | 10 +++++----- .../networking/mailreaders/thunderbird/packages.nix | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch deleted file mode 100644 index f386ee5a5d7f6..0000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch +++ /dev/null @@ -1,13 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -120,9 +120,6 @@ - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - --* content/messenger/buildconfig.html (content/buildconfig.html) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html -- - comm.jar: - % content communicator %content/communicator/ - content/communicator/contentAreaClick.js (content/contentAreaClick.js) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch index c4e29f6355cf0..f386ee5a5d7f6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch @@ -1,13 +1,13 @@ Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. --- a/comm/mail/base/jar.mn +++ b/comm/mail/base/jar.mn -@@ -119,9 +119,6 @@ messenger.jar: +@@ -120,9 +120,6 @@ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - + -* content/messenger/buildconfig.html (content/buildconfig.html) -% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html - - # L10n resources and overrides. - % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd - % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd + comm.jar: + % content communicator %content/communicator/ + content/communicator/contentAreaClick.js (content/contentAreaClick.js) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index d0c40bc8b5be0..994a05651a5e9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -13,7 +13,7 @@ let }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. - ./no-buildconfig-115.patch + ./no-buildconfig.patch ]; meta = with lib; {