nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 03:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
canonicaljson: 1.6.5 -> 2.0.0, matrix-synapse: 1.80.0 -> 1.81.0
This commit is contained in:
Maximilian Bosch 2023-04-13 12:20:19 +02:00 committed by GitHub
commit ef82956555
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/canonicaljson/default.nix
View File

@ -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"
];

9
pkgs/servers/matrix-synapse/default.nix
View File

@ -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