Unverified Commit 6fe9af91 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents e0e21b78 82aaf637

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -11591,6 +11591,13 @@ 
    githubId = 1001112;

    name = "Marcin Janczyk";

  };

  mjm = {

    email = "matt@mattmoriarity.com";

    github = "mjm";

    githubId = 1181;

    matrix = "@mjm:beeper.com";

    name = "Matt Moriarity";

  };

  mjp = {

    email = "mike@mythik.co.uk";

    github = "MikePlayle";

pkgs/applications/misc/blender/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
, potrace

, openxr-loader

, embree, gmp, libharu

, openpgl

, mesa

, runCommand

}:
@@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: rec { 
      potrace

      libharu

      libepoxy

      openpgl

    ]

    ++ lib.optionals waylandSupport [

      wayland wayland-protocols libffi libdecor libxkbcommon dbus

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

+415 −405

File changed.

Preview size limit exceeded, changes collapsed.

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

+405 −405

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −4
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
{

  firefox = buildMozillaMach rec {

    pname = "firefox";

    version = "118.0";

    version = "118.0.1";

    src = fetchurl {

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

      sha512 = "7c34c43930bda84d17a241fe7e0f8e6ca262410423ae7e7cc8444224aea2d25a52acc9079064ba57f3350e3573eb23aeaf7a2d98136d17e6fa89a61aaf57155d";

      sha512 = "b1efa1afea70434dc2a18d335bb8b526883cde200f1503b8c5fd2e7db8285e6a999cfa3aac354ea1c15a91d13a46d68db37023235314240b59eb8f55e01554ad";

    };



    meta = {
@@ -90,11 +90,11 @@ 


  firefox-esr-115 = buildMozillaMach rec {

    pname = "firefox-esr-115";

    version = "115.3.0esr";

    version = "115.3.1esr";

    applicationName = "Mozilla Firefox ESR";

    src = fetchurl {

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

      sha512 = "4a85095620a61dc516cfce6f288ba491a99c72a78c6dfae264c1292f9eba902e3df7101b97a6f8531114ccce421c92586e143872798aafd7aabbe98a257692ee";

      sha512 = "65cb6fc46bba03eed742bd67f8e36b63b19f2ad7b85d2f503595704a4e88f554758a1e66ba548c8efe97a76322fb2514db72e6ff4bb2992d1aaa86edc3af85f1";

    };



    meta = {