summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2021-09-29 01:56:20 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2021-11-02 20:12:24 +0100
commit6739a8c5e8025972a00bb143e2284221985cddf7 (patch)
tree5d612bb8d3e365ae42b6b647560181c6f83b87ce /pkgs
parentc619cf79ace9e6c7a2ec095cbaae37a99b7ffa1b (diff)
matrix-synapse: unpin frozendict
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/matrix-synapse/default.nix24
1 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 5236f85a4ffe..e2bdc793a582 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -5,26 +5,10 @@
}:
let
-py = python3.override {
- packageOverrides = self: super: {
- frozendict = super.frozendict.overridePythonAttrs (oldAttrs: rec {
- version = "1.2";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp";
- };
- doCheck = false;
- });
- };
-};
-in
-
-with py.pkgs;
-
-let
- plugins = py.pkgs.callPackage ./plugins { };
+ plugins = python3.pkgs.callPackage ./plugins { };
tools = callPackage ./tools { };
in
+with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.45.1";
@@ -82,13 +66,13 @@ buildPythonApplication rec {
doCheck = !stdenv.isDarwin;
checkPhase = ''
- PYTHONPATH=".:$PYTHONPATH" ${py.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
+ PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
'';
passthru.tests = { inherit (nixosTests) matrix-synapse; };
passthru.plugins = plugins;
passthru.tools = tools;
- passthru.python = py;
+ passthru.python = python3;
meta = with lib; {
homepage = "https://matrix.org";