From 880e098a9f4f8e88d7f1cf2019522474bdc82fdd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 20 Dec 2019 13:42:04 +0100 Subject: [PATCH] matrix-synapse: 1.7.1 -> 1.7.2 https://github.com/matrix-org/synapse/releases/tag/1.7.2 Building for now with Python 3.7 as Python 3.8.1 changed it's behavior regarding URL parsing[1] which broke one of its dependencies[2]. [1] https://bugs.python.org/issue27657 [2] https://hydra.nixos.org/build/108652790 / https://github.com/mozilla/bleach/issues/503 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 30ccf6512f2..c270caa5a8e 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.7.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "1aix4n4nk90xh6y3w3gvq3wzvykzz7mhj9isl437nid7mf9mcj6n"; + sha256 = "1nhzjmxzv5bvihl58cdpjw3hdghbh2pz7sg437k841mjn1qqq5lx"; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24f7451f656..4d9bc51b736 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4477,7 +4477,9 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; - matrix-synapse = callPackage ../servers/matrix-synapse { python3 = python38; }; + /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails + (https://github.com/NixOS/nixpkgs/issues/76093) */ + matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {};