public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vladimír Čunát 2020-11-14 21:07:43 +01:00
commit b94e7b7d89
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -26,7 +26,6 @@ rec {
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". 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. # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
license = lib.licenses.mpl20; license = lib.licenses.mpl20;
timeout = 28800; # eight hours
}; };
updateScript = callPackage ./update.nix { updateScript = callPackage ./update.nix {
attrPath = "firefox-unwrapped"; attrPath = "firefox-unwrapped";

1
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

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