Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1d8470b1640a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 263f7b78d6f0
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 16, 2018

  1. thunderbird: Remove buildconfig 

    This reduces the closure size from 1689 MiB to 425 MiB.

(cherry picked from commit 2be4295)
    @edolstra @andir
    edolstra authored and andir committed Nov 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    06c14ee View commit details

  2. Merge #49677: thunderbird*: 60.2.1 -> 60.3.0 

    Critical security fixes.

(cherry picked from commit 5b94195)
    @vcunat @andir
    vcunat authored and andir committed Nov 16, 2018

    Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    andir’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    f6112b2 View commit details

  3. thunderbird-bin: 60.3.0 -> 60.3.1 

    (cherry picked from commit 52fc63e)
    @taku0 @andir
    taku0 authored and andir committed Nov 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    10869fb View commit details

  4. thunderbird: 60.3.0 -> 60.3.1 

    (cherry picked from commit 1e8694d)
    @taku0 @andir
    taku0 authored and andir committed Nov 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    263f7b7 View commit details
Showing with 239 additions and 242 deletions.
  1. +233 −233 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
  2. +6 −9 pkgs/applications/networking/mailreaders/thunderbird/default.nix
466 changes: 233 additions & 233 deletions pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
View file

Large diffs are not rendered by default.

15 changes: 6 additions & 9 deletions pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,11 +24,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
version = "60.2.1";
version = "60.3.1";

src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "018l9pq03nzlirpaf285qpwvb8s4msam8n91d15lzc1bc1caq9zcy2dnrnvn5av3jlapm9ckz028iar66nhqxi2kkqbmiaq0v4s6kfp";
sha512 = "266m4kwxiwh1zi60z4gcs54k4w903aximafngmmqaa5nkxnsxh6sp62j1mazdh52g40pzdy9sqb8zkcjsm7dp937kpcl2lvw778lanm";
};

# from firefox, but without sound libraries
@@ -47,14 +47,9 @@ in stdenv.mkDerivation rec {
# from firefox + m4 + wrapperTool
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];

# https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540
# https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c
patches = [
(fetchpatch {
name = "bc651d3d910c.patch";
url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c";
sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g";
})
# Remove buildconfig.html to prevent a dependency on clang etc.
../../browsers/firefox/no-buildconfig.patch
];

configureFlags =
@@ -191,6 +186,8 @@ in stdenv.mkDerivation rec {
"$out/bin/thunderbird" --version
'';

disallowedRequisites = [ stdenv.cc ];

meta = with stdenv.lib; {
description = "A full-featured e-mail client";
homepage = http://www.mozilla.org/thunderbird/;