diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2023-04-14 16:01:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-14 16:01:35 +0200 |
| commit | caa1ab29f27b4c91a2150fb4906d6730be0fae38 (patch) | |
| tree | 525775bc88b123802d41a21506c3609c1592203a | |
| parent | samba: 4.17.5 -> 4.17.7 (diff) | |
| parent | matrix-synapse: 1.80.0 -> 1.81.0 (diff) | |
| download | nixpkgs-caa1ab29f27b4c91a2150fb4906d6730be0fae38.tar.gz | |
Merge pull request #226007 from Ma27/backport-matrix-synapse
[22.11] matrix-synapse: 1.80.0 -> 1.81.0, canonicaljson: 1.6.5 -> 2.0.0
| -rw-r--r-- | pkgs/development/python-modules/canonicaljson/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 9 |
2 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 3e88db6c915b..add996833205 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, frozendict , pytestCheckHook , pythonOlder , setuptools @@ -10,14 +9,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.4"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bAmyEZUR8w6xEmz82XOhCCTiDxz9JQOc3j0SGN2cjY8="; + hash = "sha256-4v2u8df63F2ctZvT0NQbBk3dppeAmsQyXc7XIdEvET8="; }; nativeBuildInputs = [ @@ -28,20 +27,10 @@ buildPythonPackage rec { simplejson ]; - passthru.optional-dependencies = { - frozendict = [ - frozendict - ]; - }; - checkInputs = [ pytestCheckHook ]; - disabledTests = [ - "test_frozen_dict" - ]; - pythonImportsCheck = [ "canonicaljson" ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 776847e43594..00772a70dbca 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,27 +11,26 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.80.0"; + version = "1.81.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-Lw6gmuI+ntOW54HQbmDoY9QYNDTu5vgtrJz6HMWWmMM="; + hash = "sha256-zOpjJSzQNgWQy52GjwR1zy3oaMRTxP92T3hNaYhmcCs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-KqPpaIJ8VuVV6f6n14/7wbA+Vtk7NvWm09bUBWuAAlY="; + hash = "sha256-s/zq8VGBdIQu/Q/2gJrLFtZJ+lsTyK+2fr9RYhBTbKA="; }; postPatch = '' # Remove setuptools_rust from runtime dependencies # https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185 sed -i '/^setuptools_rust =/d' pyproject.toml - sed -i 's/^frozendict = ">=1,!=2.1.2,<2.3.5"/frozendict = ">=1,!=2.1.2,<2.3.6"/g' pyproject.toml ''; nativeBuildInputs = [ @@ -51,8 +50,8 @@ buildPythonApplication rec { bleach canonicaljson daemonize - frozendict ijson + immutabledict jinja2 jsonschema lxml |