firefox-beta-bin, firefox-devedition-bin: remove

This commit is contained in:
taku0
2025-06-06 21:39:16 +09:00
parent 6afe187897
commit e048bd23c4
6 changed files with 5 additions and 4988 deletions

View File

@@ -74,9 +74,7 @@ in
defaultText = lib.literalExpression "pkgs.firefox";
relatedPackages = [
"firefox"
"firefox-beta-bin"
"firefox-bin"
"firefox-devedition-bin"
"firefox-esr"
];
};

View File

@@ -14,7 +14,6 @@
pciutils,
pipewire,
adwaita-icon-theme,
channel,
generated,
writeScript,
writeText,
@@ -34,8 +33,7 @@ let
inherit (generated) version sources;
binaryName =
if (channel == "release" || stdenv.hostPlatform.isDarwin) then "firefox" else "firefox-${channel}";
binaryName = "firefox";
mozillaPlatforms = {
i686-linux = "linux-i686";
@@ -68,7 +66,7 @@ let
source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
pname = "firefox-${channel}-bin-unwrapped";
pname = "firefox-bin-unwrapped";
in
stdenv.mkDerivation {
@@ -144,7 +142,6 @@ stdenv.mkDerivation {
updateScript = import ./update.nix {
inherit
pname
channel
lib
writeScript
xidel
@@ -155,11 +152,7 @@ stdenv.mkDerivation {
curl
runtimeShell
;
baseUrl =
if channel == "developer-edition" then
"https://archive.mozilla.org/pub/devedition/releases/"
else
"https://archive.mozilla.org/pub/firefox/releases/";
baseUrl = "https://archive.mozilla.org/pub/firefox/releases/";
};
};

View File

@@ -670,6 +670,8 @@ mapAliases {
fingerd_bsd = bsd-fingerd;
fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10
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-bin = lib.warnOnInstantiate "`firefox-beta-bin` is removed. Please use `firefox-beta` or `firefox-bin` instead." firefox-beta;
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-wayland = firefox; # Added 2022-11-15

View File

@@ -12434,7 +12434,6 @@ with pkgs;
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
inherit (firefox-unwrapped.passthru) applicationName;
channel = "release";
generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix;
};
@@ -12442,27 +12441,6 @@ with pkgs;
pname = "firefox-bin";
};
firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override {
inherit (firefox-beta-unwrapped.passthru) applicationName;
channel = "beta";
generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
};
firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
pname = "firefox-beta-bin";
};
firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
inherit (firefox-devedition-unwrapped.passthru) applicationName;
channel = "developer-edition";
generated = import ../applications/networking/browsers/firefox-bin/developer-edition_sources.nix;
};
firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
pname = "firefox-devedition-bin";
wmClass = "firefox-aurora";
};
librewolf-unwrapped = import ../applications/networking/browsers/librewolf {
inherit
stdenv