diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-22 19:49:40 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-22 19:49:40 +0000 |
| commit | 20437996b9a2db0a9d32391d15fbd1e8872f3baf (patch) | |
| tree | 6b3287be5160b30523675178d52ba440e4267465 /nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix | |
| parent | 0f33cd5208992fe4992f932374a872f7687b9a6d (diff) | |
| parent | a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb (diff) | |
| download | nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.gz nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.bz2 nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.lz nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.xz nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.tar.zst nixlib-20437996b9a2db0a9d32391d15fbd1e8872f3baf.zip | |
Merge commit 'a37d70e902fed9b9c0d1d4ac978e4373b86cc9bb'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index da599367af3a..3ae60816b5a0 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/nixpkgs/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 |