Unverified Commit 5a82f82c authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #325594 from mweinelt/firefox-128.0 

Firefox: 127.0.2 -> 128.0; 115.12.0esr -> 115.13.0esr; init 128.0esr
parents 311b2cea 6d85f70d

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,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; };

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix

+419 −409

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/browsers/firefox/packages.nix

+33 −4
Original line number Diff line number Diff line
@@ -5,10 +5,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 = [
@@ -94,13 +94,42 @@ 
    };

  };



  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.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 = {

pkgs/top-level/all-packages.nix

+8 −1
Original line number Diff line number Diff line
@@ -30764,6 +30764,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 { };









@@ -30782,13 +30783,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 {















    channel = "release";