diff options
| author | Rob <86313040+robert-manchester@users.noreply.github.com> | 2023-10-17 19:02:16 -0700 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-22 19:49:01 +0000 |
| commit | a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb (patch) | |
| tree | 6bcc6374a0f4a4c59d57326e006a747336f76dbc | |
| parent | 4b1fe40ce001df59728ad130f371d01fc26ad6bd (diff) | |
| download | nixpkgs-a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb.tar nixpkgs-a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb.tar.gz nixpkgs-a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb.tar.bz2 nixpkgs-a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb.tar.lz nixpkgs-a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb.tar.xz nixpkgs-a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb.tar.zst nixpkgs-a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb.zip | |
weechatScripts.weechat-matrix: Fix compatibility with matrix-nio 0.21
weechat-matrix script crashes at load time due to changes in matrix-nio. Patching 'matrix/config.py' from this commit fixes it: https://github.com/poljar/weechat-matrix/commit/feae9fda26ea9de98da9cd6733980a203115537e
| -rw-r--r-- | pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index da599367af3..3ae60816b5a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -34,10 +34,19 @@ in buildPythonPackage { hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc="; }; - patches = fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/poljar/weechat-matrix/pull/309.patch"; - sha256 = "sha256-Grdht+TOFvCYRpL7uhPivqL7YzLoNVF3iQNHgbv1Te0="; - }; + patches = [ + # server: remove set_npn_protocols() + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/poljar/weechat-matrix/pull/309.patch"; + hash = "sha256-Grdht+TOFvCYRpL7uhPivqL7YzLoNVF3iQNHgbv1Te0="; + }) + # Fix compatibility with matrix-nio 0.21 + (fetchpatch { + url = "https://github.com/poljar/weechat-matrix/commit/feae9fda26ea9de98da9cd6733980a203115537e.patch"; + hash = "sha256-MAfxJ85dqz5PNwp/GJdHA2VvXVdWh+Ayx5g0oHiw9rs="; + includes = ["matrix/config.py"]; + }) + ]; propagatedBuildInputs = [ pyopenssl |