diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-11-13 14:55:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 14:55:30 +0100 |
| commit | 281479cb07c394906a573451e259cfa054ba0bf8 (patch) | |
| tree | 46d7c1ec3c7fdaaf2e9df30d9610b60df360068f /pkgs/servers/matrix-synapse | |
| parent | 91f58a36fccbe8be5a599b7f7899ebd43ae5b76c (diff) | |
| parent | 6739a8c5e8025972a00bb143e2284221985cddf7 (diff) | |
| download | nixpkgs-281479cb07c394906a573451e259cfa054ba0bf8.tar nixpkgs-281479cb07c394906a573451e259cfa054ba0bf8.tar.gz nixpkgs-281479cb07c394906a573451e259cfa054ba0bf8.tar.bz2 nixpkgs-281479cb07c394906a573451e259cfa054ba0bf8.tar.lz nixpkgs-281479cb07c394906a573451e259cfa054ba0bf8.tar.xz nixpkgs-281479cb07c394906a573451e259cfa054ba0bf8.tar.zst nixpkgs-281479cb07c394906a573451e259cfa054ba0bf8.zip | |
Merge pull request #139816 from mweinelt/frozendict-et-al
matrix-synapse: unpin frozendict
Diffstat (limited to 'pkgs/servers/matrix-synapse')
| -rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index ed6b7ccd9f6..676abec8ecc 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.46.0"; @@ -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"; |