From ca448b27882edf1095df91551ab45218e251d50c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 30 Oct 2024 18:20:44 -0400 Subject: [PATCH] thunderbird: add -latest and -esr flavors The default `thunderbird` derivation will continue pointing to the (latest) -esr release. The new `thunderbird-latest` derivation will track non-esr releases (currently 132.0). The existing `thunderbird-128` derivation is intact. --- .../mailreaders/thunderbird/packages.nix | 15 ++++++++++++++- pkgs/top-level/all-packages.nix | 7 +++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index dd4ee1ff9361..4e781672d841 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -53,7 +53,20 @@ let }; in rec { - thunderbird = thunderbird-128; + # Upstream claims -latest is "for testing purposes only". Stick to -esr until this changes. + thunderbird = thunderbird-esr; + + thunderbird-latest = common { + version = "132.0"; + sha512 = "71206606d691e3b257b4b163e56604eaff221a43f88015fcbdbbbb3bbd708a7459f61b0470f7534ce9adafd41561e11b3487484fbfe3e95a06674785cae97029"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-latest"; + }; + }; + + # Eventually, switch to an updateScript without versionPrefix hardcoded... + thunderbird-esr = thunderbird-128; thunderbird-128 = common { version = "128.4.0esr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 364bf2acce85..4f0503511c83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32693,6 +32693,13 @@ with pkgs; thunderbird-unwrapped = thunderbirdPackages.thunderbird; thunderbird = wrapThunderbird thunderbird-unwrapped { }; + thunderbird-latest-unwrapped = thunderbirdPackages.thunderbird-latest; + thunderbird-latest = wrapThunderbird thunderbird-latest-unwrapped { }; + + thunderbird-esr-unwrapped = thunderbirdPackages.thunderbird-esr; + thunderbird-esr = wrapThunderbird thunderbird-esr-unwrapped { }; + + thunderbird-128-unwrapped = thunderbirdPackages.thunderbird-128; thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { }; thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped {