Unverified Commit d1291f97 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #326873: thunderbird-128: init at 128.0esr (+refactor)

parents f645a375 37a7071f

pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
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)

pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch

+5 −5
Original line number Diff line number Diff line 
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)

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

+29 −11
Original line number Diff line number Diff line 
{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu73, 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`.

      ./no-buildconfig-115.patch

      ./no-buildconfig.patch

    ];



    meta = with lib; {
@@ -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,30 @@ 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";

    };

  };



  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";

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

+1 −1
Original line number Diff line number Diff line
@@ -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"]))

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -34382,6 +34382,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";