public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-31 18:02:32 +00:00 committed by GitHub
commit b5d8a72c06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/matrix-synapse/default.nix
View File

@ -24,11 +24,11 @@ let
in in
with py.pkgs; buildPythonApplication rec { with py.pkgs; buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.41.0"; version = "1.41.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-KLsTr8dKp8k7TcrC598ApDib7P0m9evmfdl8jbsZLdc="; sha256 = "1vaym6mxnwg2xdqjcigi2sb0kkdi0ly5d5ghakfsysxcfn08d1z8";
}; };
patches = [ patches = [

2
pkgs/stdenv/native/default.nix
View File

@ -132,7 +132,7 @@ in
inherit lib nativePrefix; inherit lib nativePrefix;
bintools = import ../../build-support/bintools-wrapper { bintools = import ../../build-support/bintools-wrapper {
name = "bintools"; name = "bintools";
inherit stdenvNoCC nativePrefix; inherit lib stdenvNoCC nativePrefix;
nativeTools = true; nativeTools = true;
nativeLibc = true; nativeLibc = true;
}; };