From 8a5a08373f5af5cf6d042df6b7bfe01a6e35957f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 24 Mar 2023 14:18:26 +0100 Subject: [PATCH] firefox-beta-unwrapped: init at 112.0b6 --- nixos/tests/all-tests.nix | 1 + .../networking/browsers/firefox/packages.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 11e355da5a78..b64d330255d3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -221,6 +221,7 @@ in { fenics = handleTest ./fenics.nix {}; ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; + 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; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index ae9bd572d805..2e0ff53652db 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -27,6 +27,33 @@ rec { }; }; + firefox-beta = buildMozillaMach rec { + pname = "firefox-beta"; + version = "112.0b6"; + applicationName = "Mozilla Firefox Beta"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "sha512-3Ae3IilmvG7twTaFnKs0TJpiuzLERdrjToTmE644VFeK2GpRgaXgFRfsSB32cyAE+zXPYN/fub8sUoPAHLMbvg=="; + }; + + meta = { + description = "A 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; + 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. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + }; + tests = [ nixosTests.firefox-beta ]; + updateScript = callPackage ./update.nix { + attrPath = "firefox-beta-unwrapped"; + versionSuffix = "b[0-9]*"; + }; + }; + firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; version = "112.0b6"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0099d4949836..27f9d1f6309a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30031,11 +30031,13 @@ with pkgs; firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {}); 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-unwrapped = firefoxPackages.firefox-esr-102; firefox = wrapFirefox firefox-unwrapped { }; + firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-devedition = wrapFirefox firefox-devedition-unwrapped { }; firefox-esr = firefox-esr-102;