From 082ea57cbae92e582e57816f56bbfb2e5c1d203f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Jul 2024 19:32:27 +0200 Subject: [PATCH 1/3] firefox-unwrapped: 127.0.2 -> 128.0 https://www.mozilla.org/en-US/firefox/128.0/releasenotes/ (cherry picked from commit de3f527ee09300b92b60e16a6035c26ab83e5424) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index a48dd918b310..74bdac691722 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "127.0.2"; + version = "128.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b"; + sha512 = "309c0e2a0bea5699e6daf4fa02300ad7fd118d2c02c35cb5fa97a5fcc6e250cc7aec34e50fe872b8fd516436bfcfe37ddf33c9d0f9291860388cd6f3f08ea9f1"; }; extraPatches = [ From e1078666fe61061e6f635bfc5f330387363c2a9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Jul 2024 19:34:01 +0200 Subject: [PATCH 2/3] firefox-esr-115-unwrapped: 115.12.0esr -> 115.13.0esr https://www.mozilla.org/en-US/firefox/115.13.0/releasenotes/ (cherry picked from commit 7956e3ce0dad0d6e95f37aa03f490f73ab58a6c4) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 74bdac691722..dc181abe096f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -94,11 +94,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.12.0esr"; + version = "115.13.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d98475061d870e0f3aa920b7c0b9b0c1cbdb3f4102f760f1d1c5ea3e45e216c673c8d3662501e7e78af4950a003a519e94b57e9b1eda8d615c159cdf62130e89"; + sha512 = "799cdf2d0494003a5addd0da703f53deb9c9d6bb6f6c95d40026363382803e2d086039c7798940a1f35f4cba111f2e8e21bde8ac2eac29fd9bd6876dd8d3a85f"; }; meta = { From 3b6aec240d2a09347509abd3e3e29c8dc08e133d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Jul 2024 19:39:05 +0200 Subject: [PATCH 3/3] firefox-esr-128-unwrapped: init at 128.0esr (cherry picked from commit 6d85f70d354a36ed959d154c81854d38e62ef61c) --- nixos/tests/all-tests.nix | 1 + .../networking/browsers/firefox/packages.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index df2b65173510..6449c6919e20 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -320,6 +320,7 @@ in { firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; }; firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job firefox-esr-115 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-115; }; + firefox-esr-128 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-128; }; firefoxpwa = handleTest ./firefoxpwa.nix {}; firejail = handleTest ./firejail.nix {}; firewall = handleTest ./firewall.nix { nftables = false; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index dc181abe096f..227c071aa28b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -92,6 +92,35 @@ }; }; + firefox-esr-128 = buildMozillaMach rec { + pname = "firefox"; + version = "128.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "b65f28a530016fd0cf46bc5f55fdec2a0cc66bd9a71b606b8d6dace1f6ce1d8744b08298549cf9c338eca1d9331dd506874ed3244bd3b856c153bd765e6071be"; + }; + + meta = { + changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/"; + description = "Web browser built from Firefox 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. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + mainProgram = "firefox"; + }; + tests = [ nixosTests.firefox ]; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-128-unwrapped"; + versionPrefix = "128"; + versionSuffix = "esr"; + }; + }; + firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; version = "115.13.0esr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df942dbde7b7..8283fb28a4b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31027,6 +31027,7 @@ with pkgs; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox-devedition-unwrapped = firefoxPackages.firefox-devedition; firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115; + firefox-esr-128-unwrapped = firefoxPackages.firefox-esr-128; firefox-esr-unwrapped = firefoxPackages.firefox-esr-115; firefox = wrapFirefox firefox-unwrapped { }; @@ -31045,13 +31046,19 @@ with pkgs; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; - firefox-esr = firefox-esr-115; + firefox-esr-128 = wrapFirefox firefox-esr-128-unwrapped { + nameSuffix = "-esr"; + desktopName = "Firefox ESR"; + wmClass = "firefox-esr"; + icon = "firefox-esr"; + }; firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { nameSuffix = "-esr"; desktopName = "Firefox ESR"; wmClass = "firefox-esr"; icon = "firefox-esr"; }; + firefox-esr = firefox-esr-115; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme;