firefox-esr-91: init at 91.0esr
This commit is contained in:
parent
810b03602b
commit
afb0e73ebc
|
@ -126,8 +126,9 @@ in
|
||||||
fancontrol = handleTest ./fancontrol.nix {};
|
fancontrol = handleTest ./fancontrol.nix {};
|
||||||
fcitx = handleTest ./fcitx {};
|
fcitx = handleTest ./fcitx {};
|
||||||
ferm = handleTest ./ferm.nix {};
|
ferm = handleTest ./ferm.nix {};
|
||||||
firefox = handleTest ./firefox.nix {};
|
firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };
|
||||||
firefox-esr = handleTest ./firefox.nix { esr = true; };
|
firefox-esr-78 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-78; };
|
||||||
|
firefox-esr-91 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-91; };
|
||||||
firejail = handleTest ./firejail.nix {};
|
firejail = handleTest ./firejail.nix {};
|
||||||
firewall = handleTest ./firewall.nix {};
|
firewall = handleTest ./firewall.nix {};
|
||||||
fish = handleTest ./fish.nix {};
|
fish = handleTest ./fish.nix {};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
|
import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
|
||||||
name = "firefox";
|
name = "firefox";
|
||||||
meta = with pkgs.lib.maintainers; {
|
meta = with pkgs.lib.maintainers; {
|
||||||
maintainers = [ eelco shlevy ];
|
maintainers = [ eelco shlevy ];
|
||||||
|
@ -8,9 +8,10 @@ import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{ imports = [ ./common/x11.nix ];
|
{ imports = [ ./common/x11.nix ];
|
||||||
environment.systemPackages =
|
environment.systemPackages = [
|
||||||
(if esr then [ pkgs.firefox-esr ] else [ pkgs.firefox ])
|
firefoxPackage
|
||||||
++ [ pkgs.xdotool ];
|
pkgs.xdotool
|
||||||
|
];
|
||||||
|
|
||||||
# Need some more memory to record audio.
|
# Need some more memory to record audio.
|
||||||
virtualisation.memorySize = "500";
|
virtualisation.memorySize = "500";
|
||||||
|
|
|
@ -31,6 +31,32 @@ rec {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
firefox-esr-91 = common rec {
|
||||||
|
pname = "firefox-esr";
|
||||||
|
ffversion = "91.0esr";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||||
|
sha512 = "e518e1536094a1da44eb45b3b0f3adc1b5532f17da2dbcc994715419ec4fcec40574fdf633349a8e5de6382942f5706757a35f1b96b11de4754855b9cf7946ae";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
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;
|
||||||
|
};
|
||||||
|
tests = [ nixosTests.firefox-esr-91 ];
|
||||||
|
updateScript = callPackage ./update.nix {
|
||||||
|
attrPath = "firefox-esr-91-unwrapped";
|
||||||
|
versionSuffix = "esr";
|
||||||
|
versionKey = "ffversion";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
firefox-esr-78 = common rec {
|
firefox-esr-78 = common rec {
|
||||||
pname = "firefox-esr";
|
pname = "firefox-esr";
|
||||||
ffversion = "78.12.0esr";
|
ffversion = "78.12.0esr";
|
||||||
|
@ -49,7 +75,7 @@ rec {
|
||||||
# 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;
|
||||||
};
|
};
|
||||||
tests = [ nixosTests.firefox-esr ];
|
tests = [ nixosTests.firefox-esr-78 ];
|
||||||
updateScript = callPackage ./update.nix {
|
updateScript = callPackage ./update.nix {
|
||||||
attrPath = "firefox-esr-78-unwrapped";
|
attrPath = "firefox-esr-78-unwrapped";
|
||||||
versionSuffix = "esr";
|
versionSuffix = "esr";
|
||||||
|
|
|
@ -24443,9 +24443,12 @@ with pkgs;
|
||||||
|
|
||||||
firefox-unwrapped = firefoxPackages.firefox;
|
firefox-unwrapped = firefoxPackages.firefox;
|
||||||
firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78;
|
firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78;
|
||||||
|
firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91;
|
||||||
firefox = wrapFirefox firefox-unwrapped { };
|
firefox = wrapFirefox firefox-unwrapped { };
|
||||||
firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; };
|
firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; };
|
||||||
|
firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; };
|
||||||
firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { };
|
firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { };
|
||||||
|
firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { };
|
||||||
firefox-esr = firefox-esr-78;
|
firefox-esr = firefox-esr-78;
|
||||||
|
|
||||||
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
|
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
|
||||||
|
|
Loading…
Reference in a new issue