Unverified Commit ef829565 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #225763 from sumnerevans/matrix-synapse-1.81 

canonicaljson: 1.6.5 -> 2.0.0, matrix-synapse: 1.80.0 -> 1.81.0
parents 0944487c 1291a568

pkgs/development/python-modules/canonicaljson/default.nix

+2 −12
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 


buildPythonPackage rec {

  pname = "canonicaljson";

  version = "1.6.5";

  version = "2.0.0";

  format = "pyproject";



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-aN/BV7AR4H2Uv3S11MzAGVhYTtlC2d/V/dcGYJ6BzUs=";

    hash = "sha256-4v2u8df63F2ctZvT0NQbBk3dppeAmsQyXc7XIdEvET8=";

  };



  nativeBuildInputs = [
@@ -28,20 +28,10 @@ buildPythonPackage rec { 
    simplejson

  ];



  passthru.optional-dependencies = {

    frozendict = [

      frozendict

    ];

  };



  nativeCheckInputs = [

    pytestCheckHook

  ];



  disabledTests = [

    "test_frozen_dict"

  ];



  pythonImportsCheck = [

    "canonicaljson"

  ];

pkgs/servers/matrix-synapse/default.nix

+4 −5
Original line number Diff line number Diff line
@@ -12,27 +12,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 = [
@@ -52,8 +51,8 @@ buildPythonApplication rec { 
    bleach

    canonicaljson

    daemonize

    frozendict

    ijson

    immutabledict

    jinja2

    jsonschema

    lxml