diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 8a78d99b79c8..71d6cb7a2fa6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -32,11 +32,14 @@ let # FIXME: let's hope that upstream will fix this soon and we can drop this hack again. # https://bugzilla.mozilla.org/show_bug.cgi?id=2040877 extraPostPatch = - lib.optionalString (lib.versionAtLeast version "151" && lib.versionOlder version "152") - '' - echo https://hg.mozilla.org/releases/comm-release/rev/becfb8fb2c70f1603882a2787e2170d5d8013949 >> sourcestamp.txt - echo https://hg.mozilla.org/releases/mozilla-release/rev/fc12dc911f904307729760a817deb829cbf8feb4 >> sourcestamp.txt - ''; + lib.optionalString (lib.versionAtLeast version "151" && lib.versionOlder version "152") '' + echo https://hg.mozilla.org/releases/comm-release/rev/becfb8fb2c70f1603882a2787e2170d5d8013949 >> sourcestamp.txt + echo https://hg.mozilla.org/releases/mozilla-release/rev/fc12dc911f904307729760a817deb829cbf8feb4 >> sourcestamp.txt + '' + # https://bugzilla.mozilla.org/show_bug.cgi?id=2006630 + + lib.optionalString (lib.versionAtLeast version "140.8" && lib.versionOlder version "151") '' + find . -name .cargo-checksum.json | xargs sed 's/"[^"]*\.gitmodules":"[a-z0-9]*",//g' -i + ''; meta = { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; @@ -88,8 +91,8 @@ rec { thunderbird-140 = common { applicationName = "Thunderbird ESR"; - version = "140.7.2esr"; - sha512 = "513bcaa496f987d0f3906aeb6fe3ea651331470646b0c58479c91bb2c8eb52e389bc8aa646437a03b611ab78bda1df7252545960ffe38086d1fc462e65421819"; + version = "140.11.1esr"; + sha512 = "93dfdd26e6f4c7dd2f7dcc2e4994980d017868341c60c93775721467abd9192b815f2de63928e7d10c965fc045ed72ca5b49ed6502a61e50104ee5cd00941d1e"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-140";