mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge pull request #253739 from mweinelt/firefox-102-removal
firefox-esr-102-unwrapped: remove
This commit is contained in:
commit
0a3aa06b53
@ -275,7 +275,6 @@ in {
|
||||
firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; };
|
||||
firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; };
|
||||
firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job
|
||||
firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; };
|
||||
firefox-esr-115 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-115; };
|
||||
firejail = handleTest ./firejail.nix {};
|
||||
firewall = handleTest ./firewall.nix { nftables = false; };
|
||||
|
@ -88,35 +88,6 @@
|
||||
env.MOZ_REQUIRE_SIGNING = "";
|
||||
});
|
||||
|
||||
firefox-esr-102 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-102";
|
||||
version = "102.15.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "87db6e32fda215253f9b3bd233ef7fa91a64349310064b8482e5c634f34cbe99a2a111d74d2b9f2a99a0b3b510dbf9039ebe4ccfc176c2554d65bc9cfb508bf9";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
|
||||
description = "A web browser built from Firefox Extended Support Release source tree";
|
||||
homepage = "http://www.mozilla.com/en-US/firefox/";
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
platforms = lib.platforms.unix;
|
||||
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.
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "firefox";
|
||||
};
|
||||
tests = [ nixosTests.firefox-esr-102 ];
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "firefox-esr-102-unwrapped";
|
||||
versionPrefix = "102";
|
||||
versionSuffix = "esr";
|
||||
};
|
||||
};
|
||||
|
||||
firefox-esr-115 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-115";
|
||||
version = "115.2.0esr";
|
||||
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) firefox firefox-esr-102 firefox-esr-115;
|
||||
inherit (nixosTests) firefox firefox-esr-115;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -182,9 +182,9 @@ stdenv.mkDerivation rec {
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) {
|
||||
inherit (nixosTests) firefox-esr-102;
|
||||
inherit (nixosTests) firefox-esr-115;
|
||||
} // lib.optionalAttrs (lib.versionAtLeast version nss_latest.version) {
|
||||
inherit (nixosTests) firefox firefox-esr-115;
|
||||
inherit (nixosTests) firefox;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -32066,7 +32066,6 @@ with pkgs;
|
||||
firefox-unwrapped = firefoxPackages.firefox;
|
||||
firefox-beta-unwrapped = firefoxPackages.firefox-beta;
|
||||
firefox-devedition-unwrapped = firefoxPackages.firefox-devedition;
|
||||
firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102;
|
||||
firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115;
|
||||
firefox-esr-unwrapped = firefoxPackages.firefox-esr-115;
|
||||
|
||||
@ -32077,7 +32076,6 @@ with pkgs;
|
||||
firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { };
|
||||
|
||||
firefox-esr = firefox-esr-115;
|
||||
firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { };
|
||||
firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { };
|
||||
|
||||
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
|
||||
|
Loading…
Reference in New Issue
Block a user