diff --git a/flake.lock b/flake.lock index a6e1908d..ace1c48b 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1695760843, - "narHash": "sha256-+Q1XeDOH4GC4C8KE6EU3VcFH/f7JzlQzw9/1fRLa04E=", + "lastModified": 1695933794, + "narHash": "sha256-j1JmMiSimtRRGH+BCM6NdTUG+ETSBg8uXJTyuevOj0o=", "owner": "accentor", "repo": "api", - "rev": "13719e2b695f51d0e201fbe5153105b3bc651241", + "rev": "341f3d8201a63cc4240db31b2f2f4055742d2285", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1695761031, - "narHash": "sha256-/peT+tsAEfAsFiPux2GX7WKMaplOZqbMp8jVFY5Ic2I=", + "lastModified": 1695933773, + "narHash": "sha256-WuY5qGwXVulHN7M7TDrOtN0exz252wicJI9UkhorCEM=", "owner": "accentor", "repo": "web", - "rev": "cabb24ed8b27f4c4255e8aca50f3895df7645d33", + "rev": "2a07b9816f62a18d0676060c513c377d35871a11", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1695195896, - "narHash": "sha256-pq9q7YsGXnQzJFkR5284TmxrLNFc0wo4NQ/a5E93CQU=", + "lastModified": 1695973661, + "narHash": "sha256-BP2H4c42GThPIhERtTpV1yCtwQHYHEKdRu7pjrmQAwo=", "owner": "numtide", "repo": "devshell", - "rev": "05d40d17bf3459606316e3e9ec683b784ff28f16", + "rev": "cd4e2fda3150dd2f689caeac07b7f47df5197c31", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1695921859, - "narHash": "sha256-9QUM3d1TxCwCMhunV7VvtV4+BOe9vynlwks8TByhFfA=", + "lastModified": 1695956969, + "narHash": "sha256-mSwhyEAq7c/4MgxCTKNg86YrrWkKAuJejVK2XEY5Sl4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ef992bca01ef97e8bbd1136693d24665390f39ce", + "rev": "f32c6288cc50298c04a86364e5947c28981c2f7d", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1695738267, - "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", + "lastModified": 1695940293, + "narHash": "sha256-VwnxcgJ97Ky++/JtR92nCkamIZm7sOyuCBn/RDW1ADE=", "owner": "nix-community", "repo": "home-manager", - "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", + "rev": "2ccb5cb542357af20eb18c83f38571da7b3bcff6", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "nur": { "locked": { - "lastModified": 1695919608, - "narHash": "sha256-qgIV/YF1qZQ9dLb4vgf17fsyT/qQjbZHQssc72aOjcQ=", + "lastModified": 1695974848, + "narHash": "sha256-efWtaXirX6oSbDgwX4bVbO8pDUjPN5ePOrC/P4Ut/hY=", "owner": "nix-community", "repo": "NUR", - "rev": "6cc8bc2570d5f6a2e64043f7dd464bb115f0620e", + "rev": "14c60a5b3e17420a52ebddb6ad1c8f53eb2b3656", "type": "github" }, "original": { @@ -655,11 +655,11 @@ ] }, "locked": { - "lastModified": 1695760609, - "narHash": "sha256-Kbk66oG+LiuCeCjtaRG3lAT8weUo48edllRLgxctVKg=", + "lastModified": 1695929741, + "narHash": "sha256-sh0lQTIVVOh20eFrkL4qFYH2ZpK4PKkC8mgxn6wDdg4=", "owner": "chvp", "repo": "tetris", - "rev": "aefa2bc7fbfe5ea83d76454a6b3b5a2dc433607a", + "rev": "5158c73b05b1d3efb05fb2387cf67fc54eea239a", "type": "github" }, "original": { diff --git a/patches/257423.patch b/patches/257423.patch deleted file mode 100644 index e6fc8a3e..00000000 --- a/patches/257423.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -index 744f593caf13f6..5f4e0c309f09fb 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.4.1", -+ "version": "4.5.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", -@@ -57,7 +57,7 @@ - "jira-client": "^8.0.0", - "markdown-it": "^12.3.2", - "matrix-appservice-bridge": "^9.0.1", -- "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1", -+ "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.7-element.1", - "matrix-widget-api": "^1.0.0", - "micromatch": "^4.0.4", - "mime": "^3.0.0", -@@ -65,11 +65,11 @@ - "nyc": "^15.1.0", - "p-queue": "^6.6.2", - "prom-client": "^14.2.0", -+ "quickjs-emscripten": "^0.23.0", - "reflect-metadata": "^0.1.13", - "source-map-support": "^0.5.21", - "string-argv": "^0.3.1", - "tiny-typed-emitter": "^2.1.0", -- "vm2": "^3.9.18", - "winston": "^3.3.3", - "xml2js": "^0.5.0", - "yaml": "^2.2.2" -@@ -92,13 +92,13 @@ - "@types/node-emoji": "^1.8.1", - "@types/uuid": "^8.3.3", - "@types/xml2js": "^0.4.11", -- "@typescript-eslint/eslint-plugin": "^5.59.1", -- "@typescript-eslint/parser": "^5.59.1", -+ "@typescript-eslint/eslint-plugin": "^6.6.0", -+ "@typescript-eslint/parser": "^6.6.0", - "@uiw/react-codemirror": "^4.12.3", - "chai": "^4.3.4", -- "eslint": "^8.39.0", -+ "eslint": "^8.49.0", - "eslint-config-preact": "^1.3.0", -- "eslint-plugin-mocha": "^9.0.0", -+ "eslint-plugin-mocha": "^10.1.0", - "mini.css": "^3.0.1", - "mocha": "^8.2.1", - "preact": "^10.5.15", -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -index 503d692256d56c..e27f39681c78e4 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.4.1", -- "srcHash": "sha256-pQSivF/90BvvqtBGTi8eSssPzJdkUNW9cXztG+V+Joo=", -- "yarnHash": "1adcl20d5nis8w3amwkcxddybikn5whgx9ixv78lm9h2mc45y6jw", -- "cargoHash": "sha256-c5hZroZ3A9dhviSuqVfNMSr5KL/FEXecuyMfZwMD9kc=" -+ "version": "4.5.1", -+ "srcHash": "sha256-uqLpwgVEfwcMTeGMDn3lDUD91GHPNyWHmCSPxuV/VC0=", -+ "yarnHash": "08dw9vbhlmqwj2nah6fv1b2sf15ibl5kg38ghkxkbccs4j7adans", -+ "cargoHash": "sha256-bIpsQni3kaoYCGLz01YdauYM8ybpx+BvVTiB6N72rIA=" - }