cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #197699 from mweinelt/matrix-appservice-irc-0.36.0

Browse source
This commit is contained in:
Martin Weinelt 2022-10-25 16:08:27 +02:00 committed by GitHub
commit 66b289211a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 1859 additions and 584 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub, fetchurl, autoPatchelfHook }: { pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub, fetchurl, autoPatchelfHook, matrix-sdk-crypto-nodejs }:
let let
ourNodePackages = import ./node-composition.nix { ourNodePackages = import ./node-composition.nix {
@ -23,9 +23,15 @@ ourNodePackages.package.override {
dontAutoPatchelf = true; dontAutoPatchelf = true;
postRebuild = ''
npm run build
'';
postInstall = '' postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \ makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \
--add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js" --add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js"
cp -rv ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs $out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/
''; '';
passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc; passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc;

2
pkgs/servers/matrix-synapse/matrix-appservice-irc/generate-dependencies.sh
View file

@ -3,7 +3,7 @@
ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)" ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)"
$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
--nodejs-14 \ --nodejs-18 \
--node-env ../../../development/node-packages/node-env.nix \ --node-env ../../../development/node-packages/node-env.nix \
--development \ --development \
--lock ./package-lock-temp.json \ --lock ./package-lock-temp.json \

2
pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {

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

File diff suppressed because it is too large Load diff

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

@ -1,16 +1,17 @@
{ {
"name": "matrix-appservice-irc", "name": "matrix-appservice-irc",
"version": "0.35.1", "version": "0.36.0",
"description": "An IRC Bridge for Matrix", "description": "An IRC Bridge for Matrix",
"main": "app.js", "main": "app.js",
"bin": "./bin/matrix-appservice-irc", "bin": "./bin/matrix-appservice-irc",
"engines": { "engines": {
"node": ">=14" "node": ">=16"
}, },
"scripts": { "scripts": {
"prepare": "npm run build", "prepare": "npm run build",
"build": "tsc --project ./tsconfig.json", "build": "tsc --project ./tsconfig.json",
"test": "BLUEBIRD_DEBUG=1 jasmine --stop-on-failure=true", "test": "BLUEBIRD_DEBUG=1 jasmine --stop-on-failure=true",
"test:e2e": "jest --config spec/e2e/jest.config.js --forceExit # Can be removed after https://github.com/matrix-org/matrix-appservice-bridge/pull/439 is merged",
"lint": "eslint -c .eslintrc --max-warnings 0 'spec/**/*.js' 'src/**/*.ts'", "lint": "eslint -c .eslintrc --max-warnings 0 'spec/**/*.js' 'src/**/*.ts'",
"check": "npm test && npm run lint", "check": "npm test && npm run lint",
"ci-test": "nyc --report text jasmine", "ci-test": "nyc --report text jasmine",
@ -28,43 +29,45 @@
"dependencies": { "dependencies": {
"@sentry/node": "^6.17.9", "@sentry/node": "^6.17.9",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"diff": "^5.0.0", "cross-fetch": "^3.1.5",
"diff": "^5.1.0",
"escape-string-regexp": "^4.0.0", "escape-string-regexp": "^4.0.0",
"extend": "^3.0.2", "extend": "^3.0.2",
"he": "^1.2.0", "he": "^1.2.0",
"logform": "^2.4.0", "logform": "^2.4.2",
"matrix-appservice-bridge": "^4.0.2", "matrix-appservice-bridge": "^6.0.0",
"matrix-org-irc": "1.3.0", "matrix-bot-sdk": "^0.6.2",
"matrix-bot-sdk": "0.5.19", "matrix-org-irc": "^1.5.0",
"nopt": "^3.0.1", "nopt": "^6.0.0",
"p-queue": "^6.6.2", "p-queue": "^6.6.2",
"pg": "^8.7.3", "pg": "^8.8.0",
"quick-lru": "^5.1.1", "quick-lru": "^5.1.1",
"request": "^2.54.0", "sanitize-html": "^2.7.2",
"sanitize-html": "^2.7.0", "winston": "^3.8.2",
"winston": "^3.6.0", "winston-daily-rotate-file": "^4.7.1"
"winston-daily-rotate-file": "^4.6.1"
}, },
"devDependencies": { "devDependencies": {
"@tsconfig/node14": "^1.0.1", "@tsconfig/node14": "^1.0.3",
"@types/bluebird": "^3.5.36", "@types/bluebird": "^3.5.36",
"@types/diff": "^5.0.2", "@types/diff": "^5.0.2",
"@types/express": "4.17.13", "@types/express": "4.17.14",
"@types/express-serve-static-core": "4.17.28", "@types/express-serve-static-core": "4.17.31",
"@types/extend": "^3.0.1", "@types/extend": "^3.0.1",
"@types/he": "^1.1.2", "@types/he": "^1.1.2",
"@types/nedb": "^1.8.12", "@types/nedb": "^1.8.12",
"@types/node": "^14", "@types/node": "^16",
"@types/nopt": "^3.0.29", "@types/nopt": "^3.0.29",
"@types/pg": "^8.6.4", "@types/pg": "^8.6.5",
"@types/sanitize-html": "^2.6.2", "@types/sanitize-html": "^2.6.2",
"@typescript-eslint/eslint-plugin": "^5.12.0", "@typescript-eslint/eslint-plugin": "^5.38.0",
"@typescript-eslint/parser": "^5.12.0", "@typescript-eslint/parser": "^5.38.0",
"eslint": "^8.9.0", "eslint": "^8.24.0",
"homerunner-client": "^0.0.6",
"jasmine": "^3.99.0", "jasmine": "^3.99.0",
"proxyquire": "^2.1.3", "jest": "^29.1.1",
"nyc": "^15.1.0", "nyc": "^15.1.0",
"request-promise-native": "^1.0.9", "proxyquire": "^2.1.3",
"typescript": "^4.8.2" "ts-jest": "^29.0.2",
"typescript": "^4.8.3"
} }
} }

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", "url": "https://github.com/matrix-org/matrix-appservice-irc",
"rev": "766d1ad7b29d9aa63f03091b1c7f5834087dc62b", "rev": "89e44e482a918476059f543d242118abf4d0fb3d",
"date": "2022-09-26T12:23:03+01:00", "date": "2022-10-25T09:47:56+01:00",
"path": "/nix/store/znwafvyiszhildblxq7iamc7s1fzbc4y-matrix-appservice-irc", "path": "/nix/store/y7x302d9lq4cbq7fczrqk6c9g54xywvr-matrix-appservice-irc",
"sha256": "134snlri05nrm49b2qlkgfa5qipkl480gxl2dlalr0wd410qipnb", "sha256": "0xsm54z9z6b7c5x8i5si8ndq6vllx8yjxlmg018l5ywzv8wcpy7k",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,