From 54672826269d8ba4fb686b0c5aaed6d4e6f568f0 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 19 Jul 2024 09:25:22 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 42 +++++++++++++++--------------- patches/321989.patch | 62 -------------------------------------------- 2 files changed, 21 insertions(+), 83 deletions(-) delete mode 100644 patches/321989.patch diff --git a/flake.lock b/flake.lock index 03a06af8..840b10a9 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1721048238, - "narHash": "sha256-whi4DURdMM10H9WbJE+KvbVqP7JLtmFYkeYA9WVK/Ic=", + "lastModified": 1721320981, + "narHash": "sha256-h+5wNKKpXqD+SPuqtMqpZP+9fvKwaf6P3coCVHUSj3k=", "owner": "accentor", "repo": "api", - "rev": "cd0100d0525bf98bc4fceed8b8104510dea5a099", + "rev": "f6da6806c374b2517cd67508cea842dcbcc0b8c0", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1721048365, - "narHash": "sha256-8EgLybFpTean+80QpAfMktkQTdXBfjUucg51OUZnCPo=", + "lastModified": 1721313623, + "narHash": "sha256-//z/Ffgd3oCGW/u5O1e8k2SQgFKzfj/EU8Vt7LaLilo=", "owner": "accentor", "repo": "web", - "rev": "12ec97dcd55f9c8b674b13788f8e38dec9bd37f8", + "rev": "8a2849d92c56657c39610a4bdf274209c42527df", "type": "github" }, "original": { @@ -220,11 +220,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721266930, - "narHash": "sha256-V8UuYJyWqKPgDPEaOBduwg2IXVNWzdJkSQvsd3XPBgQ=", + "lastModified": 1721354212, + "narHash": "sha256-YRrHPHZLChSw+BPoSJDab0d6fHs6YCYuwYqa0hWiFEI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3bbe0ad8b6c1f771b1777022d9aa69f83dbe7f3b", + "rev": "3eae83adf4308dc534ee7b22a46f3dbdc0bd3f7b", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -453,11 +453,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", "type": "github" }, "original": { @@ -485,11 +485,11 @@ }, "nur": { "locked": { - "lastModified": 1721308608, - "narHash": "sha256-9+sG0T06cECg/WR19qX6k0t1BQz4qMmfB7k9N+1QGS8=", + "lastModified": 1721363543, + "narHash": "sha256-aNH6r/7zzEmiGdjkV+m4xxqnzLKNFV1FFeHQBBwqBOA=", "owner": "nix-community", "repo": "NUR", - "rev": "6a52aa02e9c127a4bbdee2412123b6df5caa02de", + "rev": "15afd41de2dd589a3da9ed431f832889f456ad1f", "type": "github" }, "original": { @@ -603,11 +603,11 @@ ] }, "locked": { - "lastModified": 1721048057, - "narHash": "sha256-kb/NEp6RJffCk/aNitGhzZLvNX44ddLcO9sUZ3N/iNs=", + "lastModified": 1721316996, + "narHash": "sha256-wzkbYY3la8AMJfPt/4Fyke+bKV3QbPdiVa+YoZZz1uY=", "owner": "chvp", "repo": "tetris", - "rev": "f1477e7aa1052ce29d7df632fc81f4b35b882331", + "rev": "21d65242c42b263db935f1247bdfed769ea4a707", "type": "github" }, "original": { diff --git a/patches/321989.patch b/patches/321989.patch deleted file mode 100644 index 39b59c41..00000000 --- a/patches/321989.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -index 0fe78286dc5e03..80739890d253c1 100644 ---- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -@@ -1,6 +1,6 @@ - { - "name": "matrix-hookshot", -- "version": "5.3.0", -+ "version": "5.4.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", -@@ -48,8 +48,8 @@ - "@octokit/rest": "^20.0.2", - "@octokit/webhooks": "^12.0.10", - "@sentry/node": "^7.52.1", -- "@vector-im/compound-design-tokens": "^0.1.0", -- "@vector-im/compound-web": "^0.9.4", -+ "@vector-im/compound-design-tokens": "^1.3.0", -+ "@vector-im/compound-web": "^4.8.0", - "ajv": "^8.11.0", - "axios": "^1.6.3", - "cors": "^2.8.5", -@@ -86,6 +86,7 @@ - "@rollup/plugin-alias": "^5.1.0", - "@tsconfig/node18": "^18.2.2", - "@types/ajv": "^1.0.0", -+ "@types/busboy": "^1.5.4", - "@types/chai": "^4.2.22", - "@types/cors": "^2.8.12", - "@types/express": "^4.17.14", -@@ -100,6 +101,7 @@ - "@typescript-eslint/eslint-plugin": "^6.17.0", - "@typescript-eslint/parser": "^6.17.0", - "@uiw/react-codemirror": "^4.12.3", -+ "busboy": "^1.6.0", - "chai": "^4.3.4", - "eslint": "^8.49.0", - "eslint-config-preact": "^1.3.0", -@@ -116,5 +118,6 @@ - "ts-node": "^10.9.1", - "typescript": "^5.3.3", - "vite": "^5.0.13" -- } -+ }, -+ "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" - } -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -index 5ab03440fc91e4..d6480bcc7a496e 100644 ---- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -@@ -1,6 +1,6 @@ - { -- "version": "5.3.0", -- "srcHash": "sha256-saniKtauX+9lZxPZOtGLlk4//ht0njgWfnOIJsdQlOQ=", -- "yarnHash": "1a52j61mb5hq62wd681zqpw7fkjhabqicdyvmam4jdd2qz2vh0w1", -- "cargoHash": "sha256-ffjAsYOML+mDBToaVVuxjLUUEpGmBzWB0nN4jzOO098=" -+ "version": "5.4.1", -+ "srcHash": "sha256-SZRMPnX4B7CHIp3aH3hh4NFgkOitpDB2w4jZLtLf4nY=", -+ "yarnHash": "1rscx9w63hpypwyj5ccnb49iwn581971ajzhfsyz1kmaf87f7hm9", -+ "cargoHash": "sha256-slH/EcFvJ3gcCsRX3rkelQDlt0elpbXOT/0/oiXN6qg=" - }