From ef5a60ff58f7f9b6ddf66bc489edee0ac0a4f69e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 19 Jan 2022 00:16:41 +0000 Subject: [PATCH 1/2] matrix-synapse: remove frozendict version constraint --- pkgs/servers/matrix-synapse/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b94257e6d5e2a..84e64af86658d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -18,6 +18,12 @@ buildPythonApplication rec { sha256 = "sha256-qhwFRveFCwflQmVCwzThC8sP+YCqckgCaXAc3IRms0g="; }; + # frozendict version constraint is to avoid a debian issue we don't have + postPatch = '' + substituteInPlace synapse/python_dependencies.py \ + --replace '"frozendict' '"frozendict", #' + ''; + buildInputs = [ openssl ]; propagatedBuildInputs = [ From 810249eb77f873de38b8ea2ab0c750dcae8b2e5c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 18 Jan 2022 22:23:55 +0000 Subject: [PATCH 2/2] python3Packages.frozendict: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/frozendict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 95c946a7751f2..d7e12cc061d59 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-jj1HNfmhPRB3Vn5WhHFmPzJE+FrImyP4yzHPIx2+Rbk="; + sha256 = "1dd0bqhai4k3fj9ydcwmc9hvbmrsklk349ys21w8x4n5xynk2hns"; }; pythonImportsCheck = [