Merge pull request #139816 from mweinelt/frozendict-et-al
matrix-synapse: unpin frozendict
This commit is contained in:
commit
281479cb07
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue