From 461f07d2262aeafc4ec7ddbd74dd063faae80eb8 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 21 Mar 2023 09:10:19 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 42 +++++++++++++-------------- patches/221796.patch | 67 -------------------------------------------- 2 files changed, 21 insertions(+), 88 deletions(-) delete mode 100644 patches/221796.patch diff --git a/flake.lock b/flake.lock index 579f3d39..ab35a175 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1679251303, - "narHash": "sha256-2GVb6gJ5NO3MxE2/ejRURot9lkHtiCP3kjuh0RChx+I=", + "lastModified": 1679363534, + "narHash": "sha256-qkDAlydOdPcX/9isuIWxKw2NxCX9Wi9kqwHfSwmNn+8=", "owner": "accentor", "repo": "api", - "rev": "fa77b355033479b75d35f1ee7a178add587a0503", + "rev": "efac478946f557069755f5f5a6e2b5ace2385919", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1679251458, - "narHash": "sha256-tomfAtPQ8aAWz2/Exe8riEONklrP55xQsd/5ZHDPogE=", + "lastModified": 1679363605, + "narHash": "sha256-hYdRriOP4o+zM+oHAe7N0vn2MeQphj67njooubEBZWw=", "owner": "accentor", "repo": "web", - "rev": "10111bc871e36628e218e8bd96f86729ba832580", + "rev": "a138093bc80ec640303691488469b139ad9006d1", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1679332672, - "narHash": "sha256-m1nkUSjPuRr9DAJsLRP9KxHuLEUZ53Ghu3qKkI+MM3o=", + "lastModified": 1679363644, + "narHash": "sha256-m0BTLTw9kF6dLbB7NvpAiSrjAwB4sGAwzy/wklqTAiY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ad8bf8e87af4ed3c5493ee665c1deef5dccde36e", + "rev": "6765dd75a28251fff7129cf6e42af55c8984b722", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1679265143, - "narHash": "sha256-5RDMW+O4owjdPz7t4K4YxH2fOHCNOcyVmSiKRUikiv0=", + "lastModified": 1679385031, + "narHash": "sha256-G0/LQ5vzjKNHFHXP/3gNH5GVUKM1t4g+GFjV0lHieLM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1b8bf5c3270386a1b6850bd77d79dbdbaf0d7a7c", + "rev": "2bf15d3835030906e727abd0e1533b98a4fb916c", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679172431, - "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", + "lastModified": 1679262748, + "narHash": "sha256-DQCrrAFrkxijC6haUzOC5ZoFqpcv/tg2WxnyW3np1Cc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", + "rev": "60c1d71f2ba4c80178ec84523c2ca0801522e0a6", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nur": { "locked": { - "lastModified": 1679352354, - "narHash": "sha256-uvdCsfooo/fVsaoK+4vLJ1VlKaInTpRu9l1VqOhi86o=", + "lastModified": 1679385510, + "narHash": "sha256-YDwW88A0OKkk2xNVZjxUHkY2IIBu6rRPsP37YzxA8Iw=", "owner": "nix-community", "repo": "NUR", - "rev": "8d5fbaeae27de678b9a10a00443be9c00a1dd9dd", + "rev": "d45d22ca56f565403fc697243b9ec79120f6e3b0", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1679247352, - "narHash": "sha256-A2p7fHAPbKZxOmDpi/YgatUPCTFFmjJgvA9WRFXsnTc=", + "lastModified": 1679363311, + "narHash": "sha256-5aAp7rYtnztNPFqPudvVdR0WBfrk2VBfI6SafesHoKM=", "owner": "chvp", "repo": "tetris", - "rev": "8a07e5fb016e9ee7ce5ebb914eeed3e9a3e9bc02", + "rev": "18f18ed0e4bc5a4f6b4f73b77f692e34116778cc", "type": "github" }, "original": { diff --git a/patches/221796.patch b/patches/221796.patch deleted file mode 100644 index fed34ea5..00000000 --- a/patches/221796.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 5bb0c0c812d1dc792f700a832323580f6f141c7f Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 18 Mar 2023 10:29:38 +0100 -Subject: [PATCH] matrix-hookshot: 2.7.0 -> 3.0.0 - ---- - pkgs/servers/matrix-synapse/matrix-hookshot/default.nix | 2 +- - pkgs/servers/matrix-synapse/matrix-hookshot/package.json | 7 +++---- - pkgs/servers/matrix-synapse/matrix-hookshot/pin.json | 6 +++--- - 3 files changed, 7 insertions(+), 8 deletions(-) - -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix -index 9903dbb1184e4..ae5ac99b6645c 100644 ---- a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix -+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix -@@ -35,7 +35,7 @@ mkYarnPackage rec { - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; -- hash = "sha256-WolkDSS5wPxtltKzq4Er2nAQ0GrsF3imim3/Ge4eguQ="; -+ hash = "sha256-bxDqv7KofinDuYDB1F0ZKWUQnz+ErU+OZc6i77nzM9Q="; - }; - - packageResolutions = { -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json -index 6676f3bb9c306..8b9701d09d765 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": "2.7.0", -+ "version": "3.0.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", -@@ -67,7 +67,6 @@ - "source-map-support": "^0.5.21", - "string-argv": "^0.3.1", - "tiny-typed-emitter": "^2.1.0", -- "uuid": "^8.3.2", - "vm2": "^3.9.11", - "winston": "^3.3.3", - "xml2js": "^0.4.23", -@@ -105,7 +104,7 @@ - "sass": "^1.51.0", - "ts-node": "^10.4.0", - "typescript": "^4.5.2", -- "vite": "^2.9.13", -- "vite-svg-loader": "^3.4.0" -+ "vite": "^4.1.4", -+ "vite-svg-loader": "^4.0.0" - } - } -diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -index d726307eeb000..b4c0f27ecfa02 100644 ---- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json -@@ -1,5 +1,5 @@ - { -- "version": "2.7.0", -- "srcHash": "rW5fqKshnF2S4w55V2GaAa2RFVM+YbwRum9OwTTpYuA=", -- "yarnHash": "0q71901ra9m9rbbczal1imqfba4b07bpr8hkpw1d1r9ghc2xjay4" -+ "version": "3.0.0", -+ "srcHash": "2fuDV2h97VdBADygMeyk2B5etFKkQdNZeOWlhMD4hJk=", -+ "yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz" - }