diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-10-19 00:42:42 +0800 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-10-20 09:57:41 +0000 |
| commit | f595a35ebfbba42099c246574ef8094b8cd8b1b5 (patch) | |
| tree | 6c8e4d28824df8e59bc07c4cbf0050ef49462f80 | |
| parent | Merge pull request #196580 from NixOS/backport-183206-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-196686-to-release-22.05.tar.gz | |
matrix-synapse: 1.68.0 -> 1.69.0origin/backport-196686-to-release-22.05
(cherry picked from commit 7c0cf03e64f99f2bc123a005578b01e21f8865f9)
| -rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index bb970bb959f4..140ee000b6d7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3, openssl, rustPlatform +{ lib, stdenv, fetchFromGitHub, python3, openssl, rustPlatform , enableSystemd ? stdenv.isLinux, nixosTests , enableRedis ? true , callPackage @@ -11,26 +11,22 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.68.0"; + version = "1.69.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-jQcprvKEbLuLWth0aWeh5mi/v8z83GIrjCsm3JdJcUM="; + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "synapse"; + rev = "v${version}"; + hash = "sha256-Epzvxy3w8Xdj8xz8GEry97J7zGudIgjUH51NcibKDvQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-k8iAYRgFCuv6QYAUW5kSEwFSEXVNAEGpPya7biS1Vlo="; + hash = "sha256-RJq4mdPtnAR45rAycGDSSuvZwkJPOiqFBp+8mnBTKvU="; }; - 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 |