From 451b949673e842acaddfa0c3eeee9998cb23c06a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 28 Sep 2026 14:02:11 +0200 Subject: [PATCH] firefox-beta: drop --- nixos/tests/all-tests.nix | 4 -- .../firefox/packages/firefox-beta.nix | 44 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 13 ------ 4 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8b68cd8f1ffa..5763fe069f9b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -647,10 +647,6 @@ in imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.firefox; }; - firefox-beta = runTest { - imports = [ ./firefox.nix ]; - _module.args.firefoxPackage = pkgs.firefox-beta; - }; firefox-devedition = runTest { imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.firefox-devedition; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix deleted file mode 100644 index 2a307f172274..000000000000 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - stdenv, - lib, - callPackage, - fetchurl, - nixosTests, - buildMozillaMach, -}: - -buildMozillaMach rec { - pname = "firefox-beta"; - binaryName = "firefox-beta"; - version = "156.0b4"; - applicationName = "Firefox Beta"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2aa751d66854145bf260dd04fe1473ca20275c02e51c07efdda769d7980cdaee6dc393cac32fe3bb4ed131249fde81e150c284ee38af5fc560da7704947a6453"; - }; - - meta = { - changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/"; - description = "Web browser built from Firefox Beta Release source tree"; - homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ jopejoe1 ]; - 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 = binaryName; - identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "mozilla" version // { - product = "firefox"; - sw_edition = "beta"; - }; - }; - tests = { - inherit (nixosTests) firefox-beta; - }; - updateScript = callPackage ../update.nix { - attrPath = "firefox-beta-unwrapped"; - versionSuffix = "b[0-9]*"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12b9281fc51d..c10722278824 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -848,7 +848,9 @@ mapAliases { fingerd_bsd = throw "'fingerd_bsd' has been renamed to/replaced by 'bsd-fingerd'"; # Converted to throw 2025-10-27 fira-code-nerdfont = throw "'fira-code-nerdfont' has been renamed to/replaced by 'nerd-fonts.fira-code'"; # Converted to throw 2025-10-27 firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10 + firefox-beta = warnAlias "'firefox-beta' has been removed as it has a too large maintaince overhead while not providing enough benefits. Please use 'firefox'" firefox; # Added 2026-09-28 firefox-beta-bin = warnAlias "`firefox-beta-bin` is removed. Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06 + firefox-beta-unwrapped = warnAlias "'firefox-beta-unwrapped' has been removed as it has a too large maintaince overhead while not providing enough benefits. Please use 'firefox-unwrapped'" firefox-unwrapped; # Added 2026-09-28 firefox-devedition-bin = warnAlias "`firefox-devedition-bin` is removed. Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06 firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; # Added 2025-08-21 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."; # Added 2025-08-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8329ef5cb86..805eb61c8f27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8473,18 +8473,6 @@ with pkgs; buildMozillaMach ; }; - firefox-beta-unwrapped = - import ../applications/networking/browsers/firefox/packages/firefox-beta.nix - { - inherit - stdenv - lib - callPackage - fetchurl - nixosTests - buildMozillaMach - ; - }; firefox-devedition-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-devedition.nix { @@ -8522,7 +8510,6 @@ with pkgs; firefox-esr-unwrapped = firefox-esr-153-unwrapped; firefox = wrapFirefox firefox-unwrapped { }; - firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-devedition = wrapFirefox firefox-devedition-unwrapped { }; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { };