summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtturi <Artturin@artturin.com>2021-09-11 22:47:27 +0300
committerGitHub <noreply@github.com>2021-09-11 22:47:27 +0300
commit05d063d9e607da68c9a1f9d92fc8da885db18899 (patch)
tree8f50d2fff8b928cb2361fb806ba650e089bc0531
parentMerge pull request #129454 from OPNA2608/update/openmpt123-0.5.10/21.05 (diff)
parentfirefox: increase silent timeout to 14400s (4h) (diff)
downloadnixpkgs-05d063d9e607da68c9a1f9d92fc8da885db18899.tar.gz
Merge pull request #137414 from Artturin/backport-129273-to-release-21.05
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index dc89b57fd94e..ed1351cf8d6f 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -21,6 +21,7 @@ rec {
badPlatforms = lib.platforms.darwin;
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.
+ maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
};
tests = [ nixosTests.firefox ];