nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228553 from chvp/bump-hookshot

Browse Source 
matrix-hookshot: 3.2.0 -> 4.0.0
This commit is contained in:
Sandro 2023-05-25 22:04:45 +02:00 committed by GitHub
commit 32e61ec5ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 6362 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock → pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.3.lock
View File

6253
pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo-beta.6.lock Normal file
View File

File diff suppressed because it is too large Load Diff

13
pkgs/development/libraries/matrix-sdk-crypto-nodejs/beta3.nix Normal file
View File

@ -0,0 +1,13 @@
import ./generic.nix {
version = "0.1.0-beta.3";
hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU=";
outputHashes = {
"uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0=";
};
cargoLock = ./Cargo-beta.3.lock;
patches = [
# This is needed because two versions of indexed_db_futures are present (which will fail to vendor, see https://github.com/rust-lang/cargo/issues/10310).
# (matrix-sdk-crypto-nodejs doesn't use this dependency, we only need to remove it to vendor the dependencies successfully.)
./remove-duplicate-dependency.patch
];
}

72
pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix
View File

@ -1,65 +1,11 @@
{ lib, stdenv, fetchFromGitHub
, cargo, rustPlatform, rustc, napi-rs-cli, nodejs, libiconv
}:
stdenv.mkDerivation rec {
pname = "matrix-sdk-crypto-nodejs";
version = "0.1.0-beta.3";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-rust-sdk";
rev = "${pname}-v${version}";
hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU=";
};
patches = [
# This is needed because two versions of indexed_db_futures are present (which will fail to vendor, see https://github.com/rust-lang/cargo/issues/10310).
# (matrix-sdk-crypto-nodejs doesn't use this dependency, we only need to remove it to vendor the dependencies successfully.)
./remove-duplicate-dependency.patch
];
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0=";
};
};
nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo
rustc
napi-rs-cli
nodejs
];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
buildPhase = ''
runHook preBuild
cd bindings/${pname}
npm run release-build --offline
runHook postBuild
'';
installPhase = ''
runHook preInstall
local -r outPath="$out/lib/node_modules/@matrix-org/${pname}"
mkdir -p "$outPath"
cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath"
runHook postInstall
'';
meta = with lib; {
description = "A no-network-IO implementation of a state machine that handles E2EE for Matrix clients";
homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs";
license = licenses.asl20;
maintainers = with maintainers; [ winter ];
inherit (nodejs.meta) platforms;
import ./generic.nix {
version = "0.1.0-beta.6";
hash = "sha256-0oLk7yq/XELS0GkeZj7PxY3KKXfzws0djF3KmxYisY0=";
outputHashes = {
"ruma-0.8.2" = "sha256-bKvcElIVugj+gZZhPFPGfCqva4fo1IqW/e9gf+q/Tfw=";
"uniffi-0.23.0" = "sha256-4WUp3PQm3ZgqHNMvz9+PBtNAeiq6m4PBViwXpQDglLk=";
"vodozemac-0.3.0" = "sha256-tAimsVD8SZmlVybb7HvRffwlNsfb7gLWGCplmwbLIVE=";
};
cargoLock = ./Cargo-beta.6.lock;
patches = [];
}

60
pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix Normal file
View File

@ -0,0 +1,60 @@
{ version, hash, outputHashes, cargoLock, patches }:
{ lib, stdenv, fetchFromGitHub
, cargo, rustPlatform, rustc, napi-rs-cli, nodejs, libiconv
}:
stdenv.mkDerivation rec {
pname = "matrix-sdk-crypto-nodejs";
inherit version patches;
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-rust-sdk";
rev = "${pname}-v${version}";
inherit hash;
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = cargoLock;
inherit outputHashes;
};
nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo
rustc
napi-rs-cli
nodejs
];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
buildPhase = ''
runHook preBuild
cd bindings/${pname}
npm run release-build --offline
runHook postBuild
'';
installPhase = ''
runHook preInstall
local -r outPath="$out/lib/node_modules/@matrix-org/${pname}"
mkdir -p "$outPath"
cp package.json index.js index.d.ts matrix-sdk-crypto.*.node "$outPath"
runHook postInstall
'';
meta = with lib; {
description = "A no-network-IO implementation of a state machine that handles E2EE for Matrix clients";
homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs";
license = licenses.asl20;
maintainers = with maintainers; [ winter ];
inherit (nodejs.meta) platforms;
};
}

25
pkgs/servers/matrix-synapse/matrix-hookshot/package.json
View File

@ -1,6 +1,6 @@
{
"name": "matrix-hookshot",
"version": "3.2.0",
"version": "4.0.0",
"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",
@ -10,7 +10,7 @@
"name": "matrix-hookshot-rs"
},
"engines": {
"node": ">=16"
"node": ">=18"
},
"scripts": {
"build:web": "vite build",
@ -30,11 +30,13 @@
"start:app": "node --require source-map-support/register lib/App/BridgeApp.js",
"start:webhooks": "node --require source-map-support/register lib/App/GithubWebhookApp.js",
"start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js",
"start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js",
"test": "mocha -r ts-node/register tests/init.ts tests/*.ts tests/**/*.ts",
"test:cover": "nyc --reporter=lcov --reporter=text yarn test",
"lint": "yarn run lint:js && yarn run lint:rs",
"lint:js": "eslint -c .eslintrc.js 'src/**/*.ts' 'tests/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx'",
"lint:rs": "cargo fmt --all -- --check",
"lint:rs:apply": "cargo fmt --all",
"generate-default-config": "ts-node src/Config/Defaults.ts --config > config.sample.yml",
"validate-config": "ts-node src/Config/Config.ts"
},
@ -53,8 +55,8 @@
"ioredis": "^5.2.3",
"jira-client": "^8.0.0",
"markdown-it": "^12.3.2",
"matrix-appservice-bridge": "^6.0.0",
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.3-element.0",
"matrix-appservice-bridge": "^9.0.0",
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1",
"matrix-widget-api": "^1.0.0",
"micromatch": "^4.0.4",
"mime": "^3.0.0",
@ -63,20 +65,19 @@
"p-queue": "^6.6.2",
"prom-client": "^14.0.1",
"reflect-metadata": "^0.1.13",
"rss-parser": "^3.12.0",
"source-map-support": "^0.5.21",
"string-argv": "^0.3.1",
"tiny-typed-emitter": "^2.1.0",
"vm2": "^3.9.11",
"vm2": "^3.9.17",
"winston": "^3.3.3",
"xml2js": "^0.4.23",
"yaml": "^1.10.2"
"xml2js": "^0.5.0",
"yaml": "^2.2.2"
},
"devDependencies": {
"@codemirror/lang-javascript": "^6.0.2",
"@napi-rs/cli": "^2.2.0",
"@preact/preset-vite": "^2.2.0",
"@tsconfig/node16": "^1.0.3",
"@tsconfig/node18": "^2.0.0",
"@types/ajv": "^1.0.0",
"@types/chai": "^4.2.22",
"@types/cors": "^2.8.12",
@ -86,10 +87,10 @@
"@types/micromatch": "^4.0.1",
"@types/mime": "^2.0.3",
"@types/mocha": "^9.0.0",
"@types/node": "^16",
"@types/node-emoji": "^1.8.1",
"@types/uuid": "^8.3.3",
"@types/xml2js": "^0.4.11",
"@types/node": "18",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"@uiw/react-codemirror": "^4.12.3",
@ -102,8 +103,8 @@
"preact": "^10.5.15",
"rimraf": "^3.0.2",
"sass": "^1.51.0",
"ts-node": "^10.4.0",
"typescript": "^4.5.2",
"ts-node": "^10.9.1",
"typescript": "^5.0.4",
"vite": "^4.1.4",
"vite-svg-loader": "^4.0.0"
}

8
pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
View File

@ -1,6 +1,6 @@
{
"version": "3.2.0",
"srcHash": "7u3JT7BFoJB95vlpKagMgWzoJg0vPYX4CEoqANW0FL4=",
"yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz",
"cargoHash": "CVJoDaQzyMJUaCx7MQg/bQHVicbkmwNpwncLSbWQwbA="
"version": "4.0.0",
"srcHash": "imZMYp1bgt5N8hPO6S4V133DoPCQoJ5TnMCG905qT1s=",
"yarnHash": "0rnb7i6v7pz2wywjrj0nb2c9am94pbxin1jiykj5p6czmzw289kl",
"cargoHash": "ldz5b7bC7qWRMVDixA4d5ls5Y1ONvElruRC+/TgQWr8="
}

13
pkgs/top-level/all-packages.nix
View File

@ -9346,9 +9346,13 @@ with pkgs;
matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { };
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack { };
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {
matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3;
};
matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { };
matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord {
matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3;
};
matrix-corporal = callPackage ../servers/matrix-corporal { };
@ -9453,7 +9457,9 @@ with pkgs;
ministat = callPackage ../tools/misc/ministat { };
mjolnir = callPackage ../servers/mjolnir { };
mjolnir = callPackage ../servers/mjolnir {
matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3;
};
mmutils = callPackage ../tools/X11/mmutils { };
@ -9981,6 +9987,7 @@ with pkgs;
};
matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { };
matrix-sdk-crypto-nodejs-0_1_0-beta_3 = callPackage ../development/libraries/matrix-sdk-crypto-nodejs/beta3.nix { };
email = callPackage ../tools/networking/email { };