From 36b603c4d8a03f753dcccc0906a72ad85b42079b Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Mon, 5 Jun 2023 14:23:04 +0200
Subject: [PATCH] Update dependencies

---
 flake.lock           | 18 +++++-----
 patches/234773.patch | 79 --------------------------------------------
 2 files changed, 9 insertions(+), 88 deletions(-)
 delete mode 100644 patches/234773.patch

diff --git a/flake.lock b/flake.lock
index c333b254..3cad0a27 100644
--- a/flake.lock
+++ b/flake.lock
@@ -180,11 +180,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1685935132,
-        "narHash": "sha256-4XuSNOHoyy8+dG60IVnHKPR7kTPAPt0HGp9lQa92ItE=",
+        "lastModified": 1685966375,
+        "narHash": "sha256-Au2k0XrnsiZHKfCpdk3/X618k9Cma7yCaQ076D/ASyw=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "22678cd26cd886c9f29775b2102981b66b6d0a42",
+        "rev": "ec3643e9cf2e09e9a328ae53de7c602b05c07b61",
         "type": "github"
       },
       "original": {
@@ -295,11 +295,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685836261,
-        "narHash": "sha256-rpxEPGeW4JZJcH58SQApJUtJ7w78VPtkF6Cut/Pq6Kg=",
+        "lastModified": 1685931219,
+        "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dd4982554e18b936790da07c4ea2db7c7600f283",
+        "rev": "7409480d5c8584a1a83c422530419efe4afb0d19",
         "type": "github"
       },
       "original": {
@@ -342,11 +342,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1685953686,
-        "narHash": "sha256-/X+bjVqwCgM34wakAhmFp47QbA89jQa/FLSNl9aDH9o=",
+        "lastModified": 1685965552,
+        "narHash": "sha256-HrbSXErQSxB2suQ6zXn5e3V3N8oK4DKpag+NRqTKqJM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "af936114a4cd8a128b23ded64db2a1090defb876",
+        "rev": "4cf1868fd5b16df653be023f8b72a0eb0b0cb3cc",
         "type": "github"
       },
       "original": {
diff --git a/patches/234773.patch b/patches/234773.patch
deleted file mode 100644
index 5d796442..00000000
--- a/patches/234773.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
-index 0c4a0956b61e7..525e9201b791f 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": "4.0.0",
-+  "version": "4.1.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",
-@@ -35,10 +35,10 @@
-     "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"
-+    "lint:rs": "cargo fmt --all -- --check && cargo clippy -- -Dwarnings",
-+    "lint:rs:apply": "cargo clippy --fix && cargo fmt --all",
-+    "generate-default-config": "ts-node src/config/Defaults.ts --config > config.sample.yml",
-+    "validate-config": "ts-node src/config/Config.ts"
-   },
-   "dependencies": {
-     "@alloc/quick-lru": "^5.2.0",
-@@ -46,6 +46,7 @@
-     "@octokit/auth-token": "^2.4.5",
-     "@octokit/rest": "^18.10.0",
-     "@octokit/webhooks": "^9.1.2",
-+    "@sentry/node": "^7.52.1",
-     "ajv": "^8.11.0",
-     "axios": "^0.24.0",
-     "cors": "^2.8.5",
-@@ -68,7 +69,7 @@
-     "source-map-support": "^0.5.21",
-     "string-argv": "^0.3.1",
-     "tiny-typed-emitter": "^2.1.0",
--    "vm2": "^3.9.17",
-+    "vm2": "^3.9.18",
-     "winston": "^3.3.3",
-     "xml2js": "^0.5.0",
-     "yaml": "^2.2.2"
-@@ -87,15 +88,15 @@
-     "@types/micromatch": "^4.0.1",
-     "@types/mime": "^2.0.3",
-     "@types/mocha": "^9.0.0",
-+    "@types/node": "18",
-     "@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",
-+    "@typescript-eslint/eslint-plugin": "^5.59.1",
-+    "@typescript-eslint/parser": "^5.59.1",
-     "@uiw/react-codemirror": "^4.12.3",
-     "chai": "^4.3.4",
--    "eslint": "^8.3.0",
-+    "eslint": "^8.39.0",
-     "eslint-config-preact": "^1.3.0",
-     "eslint-plugin-mocha": "^9.0.0",
-     "mini.css": "^3.0.1",
-diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
-index 106278288dfff..c7f2b263ed315 100644
---- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
-+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
-@@ -1,6 +1,6 @@
- {
--  "version": "4.0.0",
--  "srcHash": "imZMYp1bgt5N8hPO6S4V133DoPCQoJ5TnMCG905qT1s=",
--  "yarnHash": "0rnb7i6v7pz2wywjrj0nb2c9am94pbxin1jiykj5p6czmzw289kl",
--  "cargoHash": "ldz5b7bC7qWRMVDixA4d5ls5Y1ONvElruRC+/TgQWr8="
-+  "version": "4.1.0",
-+  "srcHash": "TcLdZ9pSZ5T2sI6q1c+BpIFR647HUrwvamuQZ333NOg=",
-+  "yarnHash": "1ydxjmr241kwhsacg4cx05951nijy6ch687xgqw4515islpb89v3",
-+  "cargoHash": "s7NOZ2fKp6i2m4HbbcIWZcZgP8n45nGZqWGG9cV+FWw="
- }