diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
| commit | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (patch) | |
| tree | 38e753812c0ceba947d65ec0555a5a66c1a5aa4e /nixpkgs/pkgs/servers/matrix-synapse | |
| parent | 46cf147fc42b72f68ecd52b3b03a8bfd6077f42b (diff) | |
| parent | 63678e9f3d3afecfeafa0acead6239cdb447574c (diff) | |
| download | nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.gz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.bz2 nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.lz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.xz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.zst nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.zip | |
Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/matrix-synapse')
| -rw-r--r-- | nixpkgs/pkgs/servers/matrix-synapse/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 04077ad2c261..02d164216f46 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.94.0"; + version = "1.95.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-26w926IPkVJiPVMoJUYvIFQMv5Kc6bl7Ps1mZsZJ2Xs="; + hash = "sha256-WYKuWTOP0w9Xtao9vF3+km4mXVTrt/mshcaXuF92voQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-xq6qPr7gfdIleV2znUdKftkOU8MB8j55m78TJR4C5Vs="; + hash = "sha256-uUu2Hu4a7J49S3rhZ7xsLJQC7seYkVScYYbWaw4Q/rU="; }; postPatch = '' @@ -113,10 +113,6 @@ python3.pkgs.buildPythonApplication rec { sentry = [ sentry-sdk ]; - opentracing = [ - jaeger-client - opentracing - ]; jwt = [ authlib ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix b/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix index 37023092a079..5ae3077060ca 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "synadm"; - version = "0.43.1"; + version = "0.44"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-z8OXrra7+fptd4zs1gxJVGLR+SA8hoexK2qY9zpSowU="; + hash = "sha256-BNmdyEITSZJb+wwyLU+zZi70kmfuYOqVDhKi8xFCf2E="; }; propagatedBuildInputs = with python3.pkgs; [ |