diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-11-14 21:07:43 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-11-14 21:12:02 +0100 |
| commit | b94e7b7d8948652a13f3159eed34499f4ca64cb9 (patch) | |
| tree | 2402e4c809fadced4f1c7043f1397d37c742bb99 /pkgs/applications/networking | |
| parent | 2c8c46290675795a449a704e876ba477c6205294 (diff) | |
| parent | 6769ad9f119a41f19e04b1cb755c43b73bb8cf28 (diff) | |
Merge #103474: firefox, thunderbird: revert meta.timeout
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e7dd034a8ac48..de0180834d2f5 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"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e4debe7a909b3..57d12b38dcdc1 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 }; } |