diff --git a/flake.lock b/flake.lock index 8f226658..2094256b 100644 --- a/flake.lock +++ b/flake.lock @@ -319,11 +319,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737632463, - "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", + "lastModified": 1737746512, + "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", + "rev": "825479c345a7f806485b7f00dbe3abb50641b083", "type": "github" }, "original": { @@ -373,11 +373,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737830484, - "narHash": "sha256-w5ST4WTfAIgpfGYZFz+iQ07D/zRTxM5frKnpYvokq+4=", + "lastModified": 1737834332, + "narHash": "sha256-xDdGby4zA2ExsKqhpsZnzuwOWzzDFiDe5Jsl/VQHF7A=", "owner": "nix-community", "repo": "NUR", - "rev": "305423847c726b90793cfa498ee38e51de23b901", + "rev": "984144561c46dd2cb82b0b7aaf9926751a87a0e3", "type": "github" }, "original": { diff --git a/patches/376057.patch b/patches/376057.patch deleted file mode 100644 index f9bbe081..00000000 --- a/patches/376057.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/pkgs/by-name/ma/matrix-hookshot/package.json b/pkgs/by-name/ma/matrix-hookshot/package.json -index c45b6a97ad669..a28129ee78492 100644 ---- a/pkgs/by-name/ma/matrix-hookshot/package.json -+++ b/pkgs/by-name/ma/matrix-hookshot/package.json -@@ -1,6 +1,6 @@ - { - "name": "matrix-hookshot", -- "version": "6.0.1", -+ "version": "6.0.2", - "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", -@@ -31,9 +31,9 @@ - "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:e2e": "tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src && yarn node --experimental-vm-modules $(yarn bin jest)", -- "test:cover": "nyc --reporter=lcov --reporter=text yarn test", -+ "test": "NODE_OPTIONS=--no-experimental-strip-types mocha -r ts-node/register tests/init.ts 'tests/*.ts' 'tests/**/*.ts'", -+ "test:e2e": "NODE_OPTIONS=--no-experimental-strip-types tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src && yarn node --experimental-vm-modules $(yarn bin jest)", -+ "test:cover": "NODE_OPTIONS=--no-experimental-strip-types nyc --reporter=lcov --reporter=text yarn test", - "lint": "yarn run lint:js && yarn run lint:rs", - "lint:js": "eslint", - "lint:rs": "cargo fmt --all -- --check && cargo clippy -- -Dwarnings", -diff --git a/pkgs/by-name/ma/matrix-hookshot/pin.json b/pkgs/by-name/ma/matrix-hookshot/pin.json -index cc81e0b96a2aa..e0aed65ff3d4e 100644 ---- a/pkgs/by-name/ma/matrix-hookshot/pin.json -+++ b/pkgs/by-name/ma/matrix-hookshot/pin.json -@@ -1,6 +1,6 @@ - { -- "version": "6.0.1", -- "srcHash": "sha256-rs4jIRdGriZ2L02gSTqIYuwLE4Xu3avS5+nyHuSyJ/c=", -+ "version": "6.0.2", -+ "srcHash": "sha256-uqbKpmqiy0rU8ByMRUqyjGmEdZgAhYiMrh0VEwwcbK8=", - "yarnHash": "0sjc333cl115pm3w69aknf20n85r8nisrdjx1231101zrz01nhhh", -- "cargoHash": "sha256-lcY0Eq64oPH0CtL4WhVx6L/Ix/m8mHqum/oLQhu6cNc=" -+ "cargoHash": "sha256-UlPT/ko9d4bUvv3kutNPEISXEbKtegWo2OVKEmUlKrg=" - }