b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #241196 from mweinelt/firefox-115.0esr

Browse source 
firefox-esr-115-unwrapped: init at 115.0esr
This commit is contained in:
Martin Weinelt 2023-07-04 16:07:48 +02:00 committed by GitHub
parent 05b6c5b4b1 cb3762857d
commit 8688964d31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View file

@ -267,6 +267,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-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; };
firefox-esr-115 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-115; };
firejail = handleTest ./firejail.nix {};
firewall = handleTest ./firewall.nix { nftables = false; };
firewall-nftables = handleTest ./firewall.nix { nftables = true; };

28
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -110,4 +110,32 @@
versionSuffix = "esr";
};
};
firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "377ab48989ec17b64bd06fed8dd80dde50c06dd4120a6ca1c2fe90a20c85d1c0ef6143a73daeb0271fb20a04b0fb53d837e116b56c63718d517b07ed4243a3e9";
};
meta = {
changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
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-115 ];
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-115-unwrapped";
versionPrefix = "115";
versionSuffix = "esr";
};
};
}

2
pkgs/development/libraries/nspr/default.nix
View file

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.tests = {
inherit (nixosTests) firefox firefox-esr-91 firefox-esr-102;
inherit (nixosTests) firefox firefox-esr-102 firefox-esr-115;
};
meta = with lib; {

9
pkgs/development/libraries/nss/generic.nix
View file

@ -16,6 +16,7 @@
# https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
enableFIPS ? false
, nixosTests
, nss_latest
}:
let
@ -189,10 +190,10 @@ stdenv.mkDerivation rec {
passthru.updateScript = ./update.sh;
passthru.tests = lib.optionalAttrs (lib.versionOlder version "3.69") {
inherit (nixosTests) firefox-esr-91;
} // lib.optionalAttrs (lib.versionAtLeast version "3.69") {
inherit (nixosTests) firefox firefox-esr-102;
passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) {
inherit (nixosTests) firefox-esr-102;
} // lib.optionalAttrs (lib.versionAtLeast version nss_latest.version) {
inherit (nixosTests) firefox firefox-esr-115;
};
meta = with lib; {

2
pkgs/top-level/all-packages.nix
View file

@ -31203,6 +31203,7 @@ with pkgs;
firefox-beta-unwrapped = firefoxPackages.firefox-beta;
firefox-devedition-unwrapped = firefoxPackages.firefox-devedition;
firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102;
firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115;
firefox-esr-unwrapped = firefoxPackages.firefox-esr-102;
firefox = wrapFirefox firefox-unwrapped { };
@ -31213,6 +31214,7 @@ with pkgs;
firefox-esr = firefox-esr-102;
firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { };
firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { };
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
inherit (gnome) adwaita-icon-theme;