From 26a8d3afe6f3a59ec4ce9a9c4b1187c5dda33d73 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 1 Aug 2023 20:37:12 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 48 ++++++++++++++++++++++---------------------- patches/246323.patch | 41 ------------------------------------- patches/246326.patch | 36 --------------------------------- 3 files changed, 24 insertions(+), 101 deletions(-) delete mode 100644 patches/246323.patch delete mode 100644 patches/246326.patch diff --git a/flake.lock b/flake.lock index 8d4c99d1..52e301b2 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1690855045, - "narHash": "sha256-FEzRHUa1AhGwBvgyl5AEPsXFCU4LkYlKxboxaZZF4Ok=", + "lastModified": 1690908110, + "narHash": "sha256-UMZwOJkfDGxRm6FOzTgPOr1rLohviKD99OKlVGIUTEc=", "owner": "accentor", "repo": "api", - "rev": "85c56facaa6324a2b202ffd32517c62402c54cea", + "rev": "664e10dc85349df0ffb5a6004fed9062e16022c4", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1690855179, - "narHash": "sha256-6gGW5AuwV5Miq1y2XzPh/VWCKcIpDvbFf2P4ioXad6U=", + "lastModified": 1690908075, + "narHash": "sha256-4z74j57IQMlwzEVsvR3j6dzSisTmJwNXze50kMsE4G0=", "owner": "accentor", "repo": "web", - "rev": "66b1e3bf47a62c7b4d18b1c3814df9dabaaee1de", + "rev": "a1c85280998a591f98325d71b45a253cd2c8d8a8", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1690886209, - "narHash": "sha256-Rtp3tsi6IaO4xQ8nDJCprMDeO1g/j1kNu7ByRv53vlU=", + "lastModified": 1690914454, + "narHash": "sha256-UfUEewyikRVJOi6E857US6dUyIqgvNPlB2XABghfCAc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "427290aa4ff074cfe31f3abd439bb9d1d24f6fc8", + "rev": "bf8fea22b4d5a5c59837c11d4675d4aa3a312957", "type": "github" }, "original": { @@ -309,11 +309,11 @@ ] }, "locked": { - "lastModified": 1690887397, - "narHash": "sha256-ckasuN7MgAiDgLkUo1IdEq8FEKymcUWKzmY6/R9KOOo=", + "lastModified": 1690910850, + "narHash": "sha256-diLPKIDpR9zubqGl0wPFKMNPV9QpT/eNkqUN2dSt19o=", "owner": "nix-community", "repo": "home-manager", - "rev": "4542db605602898fe0c431e19f01e1af2865dae8", + "rev": "8c731978f0916b9a904d67a0e53744ceff47882c", "type": "github" }, "original": { @@ -395,11 +395,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690789960, - "narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=", + "lastModified": 1690881714, + "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb942492b7accdee4e6d17f5447091c65897dde4", + "rev": "9e1960bc196baf6881340d53dccb203a951745a2", "type": "github" }, "original": { @@ -441,11 +441,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1690726002, - "narHash": "sha256-cACz6jCJZtsZHGCJAN4vMobxzH5s6FCOTZHMrh/Hu0M=", + "lastModified": 1690835256, + "narHash": "sha256-SZy/Nvwbf6CorhEsvmjqgjoYNLnRfaKVZMfSnpUDPnc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "391e8db1f06c3f74c2d313a73135515023af3993", + "rev": "b7cde1c47b7316f6138a2b36ef6627f3d16d645c", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nur": { "locked": { - "lastModified": 1690904771, - "narHash": "sha256-CE3z+fD1RBxDhjPS1O6/6veTehCKpi4o3pjjl0sfsGo=", + "lastModified": 1690911506, + "narHash": "sha256-R+uH7XqpbwxkLhPrDx8Gka9K44O90wZFbDS69fNcogc=", "owner": "nix-community", "repo": "NUR", - "rev": "7022b8873656b25b057d6e8ff542e990acd16247", + "rev": "23cc2f271009ca00ef891b9b9adef0a6274e211c", "type": "github" }, "original": { @@ -594,11 +594,11 @@ ] }, "locked": { - "lastModified": 1690854903, - "narHash": "sha256-j3spoCZY/zM/uZA5YJf3Qtdsc0CYB3JQ9Gx+Ve6FnLs=", + "lastModified": 1690911337, + "narHash": "sha256-A/1JnmzSpJXdbc1gGmL8vbl5Wlb1NVFpOuFHg4H1R9A=", "owner": "chvp", "repo": "tetris", - "rev": "8f19835b568ab8bf13aaf901d2eba8ae8ea03ae9", + "rev": "7cc0d8002858d88441191f6f1e714b8b1d2628da", "type": "github" }, "original": { diff --git a/patches/246323.patch b/patches/246323.patch deleted file mode 100644 index 59aa0e7c..00000000 --- a/patches/246323.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json -index aa3225725df3f..d4a27436aea1e 100644 ---- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json -+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json -@@ -1,6 +1,6 @@ - { - "name": "matrix-appservice-slack", -- "version": "2.1.1", -+ "version": "2.1.2", - "description": "A Matrix <--> Slack bridge", - "engines": { - "node": ">=16 <=18" -@@ -42,12 +42,13 @@ - "axios": "^0.27.2", - "classnames": "^2.3.2", - "escape-string-regexp": "^4.0.0", -- "matrix-appservice-bridge": "^8.1.1", -+ "https-proxy-agent": "^5.0.1", -+ "matrix-appservice-bridge": "^8.1.2", - "matrix-widget-api": "^1.1.1", - "minimist": "^1.2.6", - "nedb": "^1.8.0", - "node-emoji": "^1.10.0", -- "nunjucks": "^3.2.3", -+ "nunjucks": "^3.2.4", - "p-queue": "^6.0.0", - "pg-promise": "^10.11.1", - "randomstring": "^1.2.1", -diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json -index f5b5f49390abc..3adfcbabae62b 100644 ---- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json -+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json -@@ -1,5 +1,5 @@ - { -- "version": "2.1.1", -- "srcHash": "sha256-+NO/V3EyqdxavnSTBU7weJnueL6+aCH3UWkqclpsId0=", -- "yarnHash": "1pqv7g3xbfs4zhmyxy5p216kq2jwjfjzxw2dv2a7hl0qwk6igyki" -+ "version": "2.1.2", -+ "srcHash": "sha256-e9k+5xvgHkVt/fKAr0XhYjbEzHYwdGRdqiPWWbT0T5M=", -+ "yarnHash": "0266rrfx0fnrhn64ivy4iygf6nl5vc5i08j6h72k2zrh3rg203kz" - } diff --git a/patches/246326.patch b/patches/246326.patch deleted file mode 100644 index f334f6bd..00000000 --- a/patches/246326.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -index 2ae23cb09a3ac..744f593caf13f 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.0", -+ "version": "4.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", -@@ -56,7 +56,7 @@ - "ioredis": "^5.2.3", - "jira-client": "^8.0.0", - "markdown-it": "^12.3.2", -- "matrix-appservice-bridge": "^9.0.0", -+ "matrix-appservice-bridge": "^9.0.1", - "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1", - "matrix-widget-api": "^1.0.0", - "micromatch": "^4.0.4", -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -index a5429d85d4600..503d692256d56 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.0", -- "srcHash": "sha256-mPLDdAVIMb5d2LPGtIfm/ofRs42081S3+QTsvqkfp3s=", -- "yarnHash": "0qd3h870mk3a2lzm0r7kyh07ykw86h9xwai9h205gnv1w0d59z6i", -- "cargoHash": "sha256-NGcnRKasYE4dleQLq+E4cM6C04Rfu4AsenDznGyC2Nk=" -+ "version": "4.4.1", -+ "srcHash": "sha256-pQSivF/90BvvqtBGTi8eSssPzJdkUNW9cXztG+V+Joo=", -+ "yarnHash": "1adcl20d5nis8w3amwkcxddybikn5whgx9ixv78lm9h2mc45y6jw", -+ "cargoHash": "sha256-c5hZroZ3A9dhviSuqVfNMSr5KL/FEXecuyMfZwMD9kc=" - }