Merge staging-next-21.11 into staging-21.11

This commit is contained in:
github-actions[bot]
2022-04-20 00:15:39 +00:00
committed by GitHub
3 changed files with 12 additions and 5 deletions

View File

@@ -112,6 +112,13 @@ stdenv.mkDerivation rec {
"big-parallel"
];
# On some systems (at least, Intel TGL iGPU), the email composer is
# broken since Webkit enables accelerated rending by default in
# 2.36. See #168645.
preFixup = ''
gappsWrapperArgs+=(--set WEBKIT_DISABLE_COMPOSITING_MODE 1)
'';
doCheck = true;
passthru = {

View File

@@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.56.0";
version = "1.57.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MWMCGgsWJqIO4xefIHxp/mtR7yxLrJOfTsb2hxlGeiY=";
sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s=";
};
buildInputs = [ openssl ];

View File

@@ -2,18 +2,18 @@
buildGo117Module rec {
pname = "mautrix-whatsapp";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
sha256 = "M44APMnpQU+9TTJu4NF528o0JvGvWja4H7XUcAHtxrA=";
sha256 = "adsGPVG/EwpzOqhFJvn3anjTXwGY27a7Bc4NNkBeqJk=";
};
buildInputs = [ olm ];
vendorSha256 = "sha256-/sj8PXHgMS+uYI6hghKx3sJViUSh82wxjO6Z4gxDHqw=";
vendorSha256 = "sha256-f2sHMUvS8maYms8eqeQe5ez6G234CkLASIuKolqhO4k=";
doCheck = false;