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

Merge pull request #241496 from mweinelt/firefox-102-esr 

firefox-esr-102-unwrapped: 102.12.0esr -> 102.13.0esr
parents 712caf8e 6ca03804

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

+1 −3
Original line number Diff line number Diff line
@@ -239,14 +239,12 @@ buildStdenv.mkDerivation { 
      hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A=";

    })

  ]

  ++ lib.optionals (lib.versionOlder version "109") [

  ++ lib.optionals (lib.versionOlder version "102.13") [

    # cherry-pick bindgen change to fix build with clang 16

    (fetchpatch {

      url = "https://git.alpinelinux.org/aports/plain/community/firefox-esr/bindgen.patch?id=4c4b0c01c808657fffc5b796c56108c57301b28f";

      hash = "sha256-lTvgT358M4M2vedZ+A6xSKsBYhSN+McdmEeR9t75MLU=";

    })

  ]

  ++ lib.optionals (lib.versionOlder version "111") [

    # cherry-pick mp4parse change fixing build with Rust 1.70+

    # original change: https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100

    # vendored to update checksums

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

+2 −2
Original line number Diff line number Diff line
@@ -85,11 +85,11 @@ 


  firefox-esr-102 = buildMozillaMach rec {

    pname = "firefox-esr-102";

    version = "102.12.0esr";

    version = "102.13.0esr";

    applicationName = "Mozilla Firefox ESR";

    src = fetchurl {

      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

      sha512 = "2a85cf1e1c83a862c2886a63dcf3e3e8bca9dd3ed72c5d0223db52387fff3796bc0dcbb508adb8c10a30729f20554c5aac37f8ad045b0088a593d28e39d77fe5";

      sha512 = "745f4a77e4c898313f11118274d27513f4baa16bb42d5b71d9bd0dbe8957dbf39a5f7ae8442cd711aca9b597bc909c04b44cb8d9094c57aa34e285e64f834fde";

    };



    meta = {