From 739b762e5685ed9a252f6793cfd64886ad2b8f6e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 11 Nov 2020 18:39:04 +0100 Subject: [PATCH 1/2] 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 https://github.com/NixOS/nixpkgs/pull/96767#issuecomment-724104413 This reverts commit c57fedb14b27292f6433287740e2eec303363ec3. --- pkgs/applications/networking/browsers/firefox/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e7dd034a8ac..de0180834d2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -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"; From 6769ad9f119a41f19e04b1cb755c43b73bb8cf28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Nov 2020 21:06:48 +0100 Subject: [PATCH 2/2] Revert "Merge #102138: thunderbird: set build timeout at eight hours" This reverts commit ef543fb416353320ba2876754e3d3240d338865e, reversing changes made to 0d657b9c61d1b568584805717f640b2bbc5a9b0e. See the parent commit. --- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e92e89c7126..e228258efcf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -332,6 +332,5 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; license = licenses.mpl20; - timeout = 28800; # eight hours }; }