alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #193022 from mweinelt/matrix-appservice-irc-0.35.1

Browse source
This commit is contained in:
Martin Weinelt 2022-09-26 14:08:11 +02:00 committed by GitHub
parent ef395e396b cc8cb2ee8e
commit 8b6972e609
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 392 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
View file

@ -7,26 +7,6 @@ let
};
version = (lib.importJSON ./package.json).version;
srcInfo = lib.importJSON ./src.json;
# TODO: package matrix-rust-sdk and use that instead of fetching & patching binaries
platform = {
"x86_64-linux" = "linux-x64-gnu";
"aarch64-linux" = "linux-arm64-gnu";
}.${stdenv.hostPlatform.system} or
(throw "matrix-appservice-irc: Unsupported platform ${stdenv.hostPlatform.system}");
matrix-sdk-crypto = let
version = "0.1.0-beta.1";
base = "https://github.com/matrix-org/matrix-rust-sdk/releases/download/matrix-sdk-crypto-nodejs-v${version}";
in
fetchurl {
url = "${base}/matrix-sdk-crypto.${platform}.node";
hash = {
"x86_64-linux" = "sha256-a6FX+KhHooipIMsJ7Fl7gmUBt8WbTUgT6sXN4N3NXRk=";
"aarch64-linux" = "sha256-jvr6gMTQ4aAk5x0iXpA28ADdaCgDpvOjmogd52Z6bIY=";
}.${stdenv.hostPlatform.system} or
(throw "matrix-appservice-irc: Unsupported platform ${stdenv.hostPlatform.system}");
};
in
ourNodePackages.package.override {
pname = "matrix-appservice-irc";
@ -46,11 +26,6 @@ ourNodePackages.package.override {
postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \
--add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js"
# install the native bindings for matrix-sdk-crypto
export CRYPTO_SDK_PATH="$out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/matrix-sdk-crypto-nodejs/matrix-sdk-crypto.${platform}.node"
cp -v ${matrix-sdk-crypto} "$CRYPTO_SDK_PATH"
autoPatchelf "$CRYPTO_SDK_PATH"
'';
passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc;

554
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json
View file

@ -1,6 +1,6 @@
{
"name": "matrix-appservice-irc",
"version": "0.35.0",
"version": "0.35.1",
"description": "An IRC Bridge for Matrix",
"main": "app.js",
"bin": "./bin/matrix-appservice-irc",
@ -33,7 +33,7 @@
"extend": "^3.0.2",
"he": "^1.2.0",
"logform": "^2.4.0",
"matrix-appservice-bridge": "^3.2.0",
"matrix-appservice-bridge": "^4.0.2",
"matrix-org-irc": "1.3.0",
"matrix-bot-sdk": "0.5.19",
"nopt": "^3.0.1",

8
pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/matrix-org/matrix-appservice-irc",
"rev": "b52ac9ec9e45fe82fb3eb9c1a5e420c1eba73b9b",
"date": "2022-09-13T09:07:52+01:00",
"path": "/nix/store/nd7jrqynfikcirmzc22jp82bgmliglnp-matrix-appservice-irc",
"sha256": "0bw06rzlsi3rddjmw1v32vlpq3clda26dcyq3f8qaily9rdxr7vn",
"rev": "766d1ad7b29d9aa63f03091b1c7f5834087dc62b",
"date": "2022-09-26T12:23:03+01:00",
"path": "/nix/store/znwafvyiszhildblxq7iamc7s1fzbc4y-matrix-appservice-irc",
"sha256": "134snlri05nrm49b2qlkgfa5qipkl480gxl2dlalr0wd410qipnb",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,