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: fb397ae7d88d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b94e7b7d8948
Choose a head ref
  • 6 commits
  • 3 files changed
  • 3 contributors

Commits on Nov 11, 2020

  1. Revert "firefox: set build timeout at eight hours" 

    The default timeout is 10h on Hydra currently, so this timeout
setting is pointless or counterproductive.
This commit seems to have been made in error
#96767 (comment)

This reverts commit c57fedb.
    @roberth
    roberth committed Nov 11, 2020
    Copy the full SHA
    739b762 View commit details

  2. thunderbird-bin: 78.4.2 -> 78.4.3

    @taku0
    taku0 committed Nov 11, 2020
    Copy the full SHA
    ec5fc9b View commit details

  3. thunderbird: 78.4.2 -> 78.4.3

    @taku0
    taku0 committed Nov 11, 2020
    Copy the full SHA
    205652e View commit details

Commits on Nov 14, 2020

  1. Revert "Merge #102138: thunderbird: set build timeout at eight hours" 

    This reverts commit ef543fb, reversing
changes made to 0d657b9.
See the parent commit.
    @vcunat
    vcunat committed Nov 14, 2020
    Copy the full SHA
    6769ad9 View commit details

  2. Merge #103597: thunderbird*: 78.4.2 -> 78.4.3

    @vcunat
    vcunat committed Nov 14, 2020
    Copy the full SHA
    2c8c462 View commit details

  3. Merge #103474: firefox, thunderbird: revert meta.timeout

    @vcunat
    vcunat committed Nov 14, 2020
    Copy the full SHA
    b94e7b7 View commit details
1 change: 0 additions & 1 deletion pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,6 @@ rec {
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
license = lib.licenses.mpl20;
timeout = 28800; # eight hours
};
updateScript = callPackage ./update.nix {
attrPath = "firefox-unwrapped";
530 changes: 265 additions & 265 deletions pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
View file

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true;

stdenv.mkDerivation rec {
pname = "thunderbird";
version = "78.4.2";
version = "78.4.3";

src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
"1bd8z6fm2nky4p3qxc5jh9dca7v7g77i6kdn6p5dzzm4gyadqvk00bfa4nzglzi9nwwyld14r3ydjd6ms012yk07q4aqdsrf51b9k4y";
"0h5ddqp1z2dphyy4mjcb7v9mrrxlnjw8rwklm0yqsbvs9m96pc1yyp4clb3wmgs7kzh3wxdwi450842m3b13wdg5h0ls7rhamd1yi0c";
};

nativeBuildInputs = [
@@ -332,6 +332,5 @@ stdenv.mkDerivation rec {
];
platforms = platforms.linux;
license = licenses.mpl20;
timeout = 28800; # eight hours
};
}