diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/matrix-synapse')
5 files changed, 24 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 60da7eafa379..04077ad2c261 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.92.1"; + version = "1.94.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-rCxoYtdvh+Gu0O2T3uu0k2FFFFc7m09LuKJvkSky3M4="; + hash = "sha256-26w926IPkVJiPVMoJUYvIFQMv5Kc6bl7Ps1mZsZJ2Xs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yZeCENWdPv80Na1++/IQFOrhah/VHWwJDNV2dI/yTHg="; + hash = "sha256-xq6qPr7gfdIleV2znUdKftkOU8MB8j55m78TJR4C5Vs="; }; postPatch = '' @@ -41,6 +41,10 @@ python3.pkgs.buildPythonApplication rec { # be extra defensive, but we don't want to deal with updating this sed -i 's/"poetry-core>=\([0-9.]*\),<=[0-9.]*"/"poetry-core>=\1"/' pyproject.toml sed -i 's/"setuptools_rust>=\([0-9.]*\),<=[0-9.]*"/"setuptools_rust>=\1"/' pyproject.toml + + # Don't force pillow to be 10.0.1 because we already have patched it, and + # we don't use the pillow wheels. + sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml ''; nativeBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json index 744f593caf13..5f4e0c309f09 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "4.4.1", + "version": "4.5.1", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -57,7 +57,7 @@ "jira-client": "^8.0.0", "markdown-it": "^12.3.2", "matrix-appservice-bridge": "^9.0.1", - "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1", + "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.7-element.1", "matrix-widget-api": "^1.0.0", "micromatch": "^4.0.4", "mime": "^3.0.0", @@ -65,11 +65,11 @@ "nyc": "^15.1.0", "p-queue": "^6.6.2", "prom-client": "^14.2.0", + "quickjs-emscripten": "^0.23.0", "reflect-metadata": "^0.1.13", "source-map-support": "^0.5.21", "string-argv": "^0.3.1", "tiny-typed-emitter": "^2.1.0", - "vm2": "^3.9.18", "winston": "^3.3.3", "xml2js": "^0.5.0", "yaml": "^2.2.2" @@ -92,13 +92,13 @@ "@types/node-emoji": "^1.8.1", "@types/uuid": "^8.3.3", "@types/xml2js": "^0.4.11", - "@typescript-eslint/eslint-plugin": "^5.59.1", - "@typescript-eslint/parser": "^5.59.1", + "@typescript-eslint/eslint-plugin": "^6.6.0", + "@typescript-eslint/parser": "^6.6.0", "@uiw/react-codemirror": "^4.12.3", "chai": "^4.3.4", - "eslint": "^8.39.0", + "eslint": "^8.49.0", "eslint-config-preact": "^1.3.0", - "eslint-plugin-mocha": "^9.0.0", + "eslint-plugin-mocha": "^10.1.0", "mini.css": "^3.0.1", "mocha": "^8.2.1", "preact": "^10.5.15", diff --git a/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json index 503d692256d5..e27f39681c78 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json +++ b/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json @@ -1,6 +1,6 @@ { - "version": "4.4.1", - "srcHash": "sha256-pQSivF/90BvvqtBGTi8eSssPzJdkUNW9cXztG+V+Joo=", - "yarnHash": "1adcl20d5nis8w3amwkcxddybikn5whgx9ixv78lm9h2mc45y6jw", - "cargoHash": "sha256-c5hZroZ3A9dhviSuqVfNMSr5KL/FEXecuyMfZwMD9kc=" + "version": "4.5.1", + "srcHash": "sha256-uqLpwgVEfwcMTeGMDn3lDUD91GHPNyWHmCSPxuV/VC0=", + "yarnHash": "08dw9vbhlmqwj2nah6fv1b2sf15ibl5kg38ghkxkbccs4j7adans", + "cargoHash": "sha256-bIpsQni3kaoYCGLz01YdauYM8ybpx+BvVTiB6N72rIA=" } diff --git a/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix index 42d62539b6b3..92e111dbb623 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix @@ -7,6 +7,7 @@ , pythonOlder , tqdm , twisted +, psycopg2 }: buildPythonPackage rec { @@ -37,6 +38,7 @@ buildPythonPackage rec { humanize tqdm twisted + psycopg2 ] # For the s3_media_upload script ++ matrix-synapse-unwrapped.propagatedBuildInputs; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix index d899c658ad36..32a64f0a669d 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.10"; + version = "0.99.11"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-TjChelGVicA59q6iIIDTI7nSj8KtjpA4bfZqsfoiOQg="; + hash = "sha256-Wd/nnJhKg+BDyOIz42zEScjzQRrpEq6YG9/9Tk24hgg="; }; - vendorHash = "sha256-E3nCcw6eTKKcL55ls6n5pYlRFffsefsN0G1Hwd49uh8="; + vendorHash = "sha256-0QSyYhOht1j1tWNxHQh+NUZA/W1xy7ANu+29H/gusOE="; subPackages = [ "cmd/syncv3" ]; @@ -31,7 +31,7 @@ buildGoModule rec { description = "A sliding sync implementation of MSC3575 for matrix"; homepage = "https://github.com/matrix-org/sliding-sync"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ emilylange ]; + maintainers = with maintainers; [ emilylange yayayayaka ]; mainProgram = "syncv3"; }; } |