Unverified Commit ac0c867e authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 198334d1 5a8c5f34

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

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
buildMozillaMach rec {

  pname = "firefox-beta";

  binaryName = "firefox-beta";

  version = "146.0b9";

  version = "147.0b9";

  applicationName = "Firefox Beta";

  src = fetchurl {

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

    sha512 = "77a9a4617f3d24f7eff77289e03e53373998ae617f601893be255a1eba85dd81fea5a26976159a25187aada7401ad8da6cbb0b5a3650c4936a7445a3a7f55d42";

    sha512 = "346beb18a5012349da2f87c82080bf5fa605339db27644bdce4474bd63246dcfa9369e7d95620ee336649ff9c1d28677ff892d2309662a9b6f7ef0f055648c81";

  };



  meta = {

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

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
buildMozillaMach rec {

  pname = "firefox-devedition";

  binaryName = "firefox-devedition";

  version = "146.0b9";

  version = "147.0b9";

  applicationName = "Firefox Developer Edition";

  requireSigning = false;

  branding = "browser/branding/aurora";

  src = fetchurl {

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

    sha512 = "6fac88325150620388f49ffe1ba0385216184b98e0faa54e01804292563798a032a8cef375dbc78a41b9ba3e18d1e9258aca5e090bc827f2e7e842f76ee34c25";

    sha512 = "66aad9dd7dc427d628fc7994a0e85997d6df0af4e0542f4bbd48dfdfe923e3b10ad6d6322c1eaed40bf30b61dfa5849785e46f7453b9fc6c478a2bb0fed6b93c";

  };



  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

+4 −4
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
  buildMozillaMach,

  callPackage,

  fetchurl,

  icu73,

  icu77,

  icu78,

  fetchpatch2,

  config,

}:
@@ -25,8 +25,8 @@ let 
        })

      ];

    });

  icu73' = patchICU icu73;

  icu77' = patchICU icu77;

  icu78' = patchICU icu78;



  common =

    {
@@ -49,8 +49,8 @@ let 
        (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)

      ];

      extraPassthru = {

        icu73 = icu73';

        icu77 = icu77';

        icu78 = icu78';

      };



      meta = {
@@ -77,8 +77,8 @@ let 


        pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"



        icu73 = icu73';

        icu77 = icu77';

        icu78 = icu78';

      };



in

pkgs/build-support/build-mozilla-mach/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ in 
  glib,

  gnum4,

  gtk3,

  icu73,

  icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides

  icu78,

  libGL,

  libGLU,

  libevent,
@@ -581,7 +581,7 @@ buildStdenv.mkDerivation { 
      libdrm

    ]

  ))

  ++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ]

  ++ [ (if (lib.versionAtLeast version "147") then icu78 else icu77) ]

  ++ lib.optional gssSupport libkrb5

  ++ lib.optional jemallocSupport jemalloc

  ++ extraBuildInputs;

pkgs/build-support/vm/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -1603,6 +1603,7 @@ in 
    makeImageTestScript

    modulesClosure

    qemu

    qemuCommandLinux

    rpmClosureGenerator

    rpmDistros

    runInLinuxImage