alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #193200 from mweinelt/matrix-synapse-1.68.0

Browse source 
matrix-synapse: 1.67.0 -> 1.68.0
This commit is contained in:
Maximilian Bosch 2022-09-27 20:39:12 +02:00 committed by GitHub
parent 1acde3a714 326b8f7d8f
commit 27f51fd568
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/servers/matrix-synapse/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, python3, openssl { lib, stdenv, python3, openssl, rustPlatform
, enableSystemd ? stdenv.isLinux, nixosTests , enableSystemd ? stdenv.isLinux, nixosTests
, enableRedis ? true , enableRedis ? true
, callPackage , callPackage
@ -11,13 +11,35 @@ in
with python3.pkgs; with python3.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.67.0"; version = "1.68.0";
format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY="; hash = "sha256-jQcprvKEbLuLWth0aWeh5mi/v8z83GIrjCsm3JdJcUM=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-k8iAYRgFCuv6QYAUW5kSEwFSEXVNAEGpPya7biS1Vlo=";
};
postPatch = ''
# Remove setuptools_rust from runtime dependencies
# https://github.com/matrix-org/synapse/blob/v1.68.0/pyproject.toml#L177-L185
sed -i '/^setuptools_rust =/d' pyproject.toml
'';
nativeBuildInputs = [
poetry-core
rustPlatform.cargoSetupHook
setuptools-rust
] ++ (with rustPlatform.rust; [
cargo
rustc
]);
buildInputs = [ openssl ]; buildInputs = [ openssl ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -63,7 +85,14 @@ buildPythonApplication rec {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
checkPhase = '' checkPhase = ''
runHook preCheck
# remove src module, so tests use the installed module instead
rm -rf ./synapse
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
runHook postCheck
''; '';
passthru.tests = { inherit (nixosTests) matrix-synapse; }; passthru.tests = { inherit (nixosTests) matrix-synapse; };