From 5b68d15c08c77da2790c5c04ad73afa41d76008d Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Tue, 31 Aug 2021 10:03:35 -0400 Subject: [PATCH 1/2] matrix-synapse: 1.41.0 -> 1.41.1 https://github.com/matrix-org/synapse/releases/tag/v1.41.1 (cherry picked from commit 5947c5989979c684d97f7154695e77e2000afbb7) --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 0f3d89f2c32..c60abd94546 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,11 +24,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.41.0"; + version = "1.41.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KLsTr8dKp8k7TcrC598ApDib7P0m9evmfdl8jbsZLdc="; + sha256 = "1vaym6mxnwg2xdqjcigi2sb0kkdi0ly5d5ghakfsysxcfn08d1z8"; }; patches = [ From 977f89b349c4854940a74d95e4a7f1ba8261b1eb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Jun 2021 22:37:29 -0700 Subject: [PATCH 2/2] stdenv/native: fix bintools import (cherry picked from commit fa38ff677af719ad8a44e9c70dc6f4fc0c5e09e9) --- pkgs/stdenv/native/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 010b4141e87..87862b84bc1 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -132,7 +132,7 @@ in inherit lib nativePrefix; bintools = import ../../build-support/bintools-wrapper { name = "bintools"; - inherit stdenvNoCC nativePrefix; + inherit lib stdenvNoCC nativePrefix; nativeTools = true; nativeLibc = true; };