diff options
author | taku0 <mxxouy6x3m_github@tatapa.org> | 2020-07-15 15:12:54 +0900 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:52:41 +0000 |
commit | 7a7018a3f262698f1f0c94a060d23d2733ddba58 (patch) | |
tree | d89483f1636919d1666e8f19c8610434b1019cc4 /nixpkgs/pkgs | |
parent | 617a4732670d9f54a6843332ebf53de1c00e112d (diff) | |
download | nixlib-7a7018a3f262698f1f0c94a060d23d2733ddba58.tar nixlib-7a7018a3f262698f1f0c94a060d23d2733ddba58.tar.gz nixlib-7a7018a3f262698f1f0c94a060d23d2733ddba58.tar.bz2 nixlib-7a7018a3f262698f1f0c94a060d23d2733ddba58.tar.lz nixlib-7a7018a3f262698f1f0c94a060d23d2733ddba58.tar.xz nixlib-7a7018a3f262698f1f0c94a060d23d2733ddba58.tar.zst nixlib-7a7018a3f262698f1f0c94a060d23d2733ddba58.zip |
thunderbird: 68.9.0 -> 78.0
- Updated the version and the source hash. - Removed unsupported options. - Updated the patch. - Tweaked dependencies; 78 requires newer versions. (cherry picked from commit 658b4d7ce536599d104c907cf8b68fe67b01550d)
Diffstat (limited to 'nixpkgs/pkgs')
3 files changed, 17 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 007ac280068b..a390e023064a 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.10.0"; + version = "78.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d"; + "0l5cgd95lxwny365x85pih71z7b9zgmix3wc8916k1xj5p46szr20ylf7b20gwwl7kajm4mrxjdldzmfvc9qzdyss76za5r76c25wwr"; }; nativeBuildInputs = [ @@ -206,14 +206,12 @@ stdenv.mkDerivation rec { in [ "--enable-application=comm/mail" - "--with-system-bz2" "--with-system-icu" "--with-system-jpeg" "--with-system-libevent" "--with-system-nspr" "--with-system-nss" "--with-system-png" # needs APNG support - "--with-system-icu" "--with-system-zlib" "--with-system-webp" "--with-system-libvpx" @@ -223,12 +221,9 @@ stdenv.mkDerivation rec { "--enable-default-toolkit=${toolkitValue}" "--enable-js-shell" "--enable-necko-wifi" - "--enable-startup-notification" "--enable-system-ffi" "--enable-system-pixman" - "--enable-system-sqlite" - "--disable-gconf" "--disable-tests" "--disable-updater" "--enable-jemalloc" diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch index fe3a93ebda7b..efbddd3fba81 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch @@ -1,31 +1,32 @@ diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp ---- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 -+++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 -@@ -32,8 +32,6 @@ - {"about", "chrome://global/content/aboutAbout.xhtml", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xul", +--- a/docshell/base/nsAboutRedirector.cpp ++++ b/docshell/base/nsAboutRedirector.cpp +@@ -63,8 +63,6 @@ + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", nsIAboutModule::ALLOW_SCRIPT}, - {"buildconfig", "chrome://global/content/buildconfig.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn ---- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200 -+++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200 -@@ -39,7 +39,6 @@ - content/global/plugins.css +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -35,7 +35,6 @@ + content/global/plugins.js content/global/browser-child.js content/global/browser-content.js -* content/global/buildconfig.html content/global/buildconfig.css content/global/contentAreaUtils.js content/global/datepicker.xhtml +diff -ru -x '*~' a/comm/mail/base/jar.mn b/comm/mail/base/jar.mn --- a/comm/mail/base/jar.mn +++ b/comm/mail/base/jar.mn -@@ -117,9 +117,7 @@ +@@ -119,9 +119,7 @@ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul + % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml -* content/messenger/buildconfig.html (content/buildconfig.html) content/messenger/buildconfig.css (content/buildconfig.css) diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 9169795f542d..47ec21cc9f40 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -22472,8 +22472,9 @@ in thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; + icu = icu67; + libvpx = libvpx_1_8; gtk3Support = true; - nss = nss_3_44; # 68.x won't build with newest nss anymore (like firefox-esr-68) }; thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { |