mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
thunderbird: 141.0 -> 142.0, drop firefox 128 (#435442)
This commit is contained in:
@@ -488,10 +488,6 @@ in
|
||||
imports = [ ./firefox.nix ];
|
||||
_module.args.firefoxPackage = pkgs.firefox-esr;
|
||||
};
|
||||
firefox-esr-128 = runTest {
|
||||
imports = [ ./firefox.nix ];
|
||||
_module.args.firefoxPackage = pkgs.firefox-esr-128;
|
||||
};
|
||||
firefox-esr-140 = runTest {
|
||||
imports = [ ./firefox.nix ];
|
||||
_module.args.firefoxPackage = pkgs.firefox-esr-140;
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
callPackage,
|
||||
fetchurl,
|
||||
nixosTests,
|
||||
buildMozillaMach,
|
||||
}:
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "128.13.0esr";
|
||||
applicationName = "Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "9e6f3af535e0904219bcac947d458789cc43cbfaf476ac287328323662391eaaadeff57b244599acf3626a2fadc0bc41b70d07e33ca6af4412006ad01ceff034";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
|
||||
description = "Web browser built from Firefox source tree";
|
||||
homepage = "http://www.mozilla.com/en-US/firefox/";
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
platforms = lib.platforms.unix;
|
||||
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;
|
||||
mainProgram = "firefox";
|
||||
};
|
||||
tests = {
|
||||
inherit (nixosTests) firefox-esr-128;
|
||||
};
|
||||
updateScript = callPackage ../update.nix {
|
||||
attrPath = "firefox-esr-128-unwrapped";
|
||||
versionPrefix = "128";
|
||||
versionSuffix = "esr";
|
||||
};
|
||||
}
|
||||
@@ -94,8 +94,8 @@ rec {
|
||||
thunderbird = thunderbird-latest;
|
||||
|
||||
thunderbird-latest = common {
|
||||
version = "141.0";
|
||||
sha512 = "cd747c0831532f90685975567102d1bdb90a780e21209fe4b7bddf2d84ac88576766706e95e22043a30a8a89b6d3daffb56a68c3ccc4a300b8236b20d4fca675";
|
||||
version = "142.0";
|
||||
sha512 = "9a871846fc395c69688310dbf4a4569b75d3b2952a34ba1f7dc9ef5a60a34bd740087b4abb2a1a4d522dfa9d6640f2f4fcc9972a2b72160d1ed3e0df71c2901c";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-latest";
|
||||
|
||||
@@ -654,6 +654,8 @@ mapAliases {
|
||||
firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed. Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition;
|
||||
firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead.";
|
||||
firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead.";
|
||||
firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead.";
|
||||
firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead.";
|
||||
firefox-wayland = firefox; # Added 2022-11-15
|
||||
firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09
|
||||
fishfight = jumpy; # Added 2022-08-03
|
||||
|
||||
@@ -12482,18 +12482,6 @@ with pkgs;
|
||||
buildMozillaMach
|
||||
;
|
||||
};
|
||||
firefox-esr-128-unwrapped =
|
||||
import ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix
|
||||
{
|
||||
inherit
|
||||
stdenv
|
||||
lib
|
||||
callPackage
|
||||
fetchurl
|
||||
nixosTests
|
||||
buildMozillaMach
|
||||
;
|
||||
};
|
||||
firefox-esr-140-unwrapped =
|
||||
import ../applications/networking/browsers/firefox/packages/firefox-esr-140.nix
|
||||
{
|
||||
@@ -12514,11 +12502,6 @@ with pkgs;
|
||||
|
||||
firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { };
|
||||
|
||||
firefox-esr-128 = wrapFirefox firefox-esr-128-unwrapped {
|
||||
nameSuffix = "-esr";
|
||||
wmClass = "firefox-esr";
|
||||
icon = "firefox-esr";
|
||||
};
|
||||
firefox-esr-140 = wrapFirefox firefox-esr-140-unwrapped {
|
||||
nameSuffix = "-esr";
|
||||
wmClass = "firefox-esr";
|
||||
|
||||
Reference in New Issue
Block a user