From 073f816a7e9c24fac0f119e62608374eae3a3552 Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Thu, 19 Oct 2023 19:16:08 +0800
Subject: [PATCH] convos: 7.02 -> 8.05

---
 .../networking/irc/convos/default.nix            | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix
index 186f1a74020b..da4967916d44 100644
--- a/pkgs/applications/networking/irc/convos/default.nix
+++ b/pkgs/applications/networking/irc/convos/default.nix
@@ -4,13 +4,13 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "convos";
-  version = "7.02";
+  version = "8.05";
 
   src = fetchFromGitHub {
     owner = "convos-chat";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-i8lDK5/Whi5uo2/Qqh5jgJGLuuHn7kdrfvr+9Ktzp/8=";
+    sha256 = "sha256-dBvXo8y4OMKcb0imgnnzoklnPN3YePHDvy5rIBOkTfs=";
   };
 
   nativeBuildInputs = [ makeWrapper ]
@@ -20,9 +20,8 @@ perlPackages.buildPerlPackage rec {
     CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt
     FileHomeDir FileReadBackwards HTTPAcceptLanguage SyntaxKeywordTry FutureAsyncAwait
     IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall
-    Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginSyslog MojoliciousPluginWebpack
-    ParseIRC TextMarkdownHoedown TimePiece UnicodeUTF8
-    CpanelJSONXS EV
+    Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginSyslog ParseIRC
+    TextMarkdownHoedown TimePiece UnicodeUTF8 CpanelJSONXS EV YAMLLibYAML
   ];
 
   propagatedBuildInputs = [ openssl ];
@@ -48,6 +47,9 @@ perlPackages.buildPerlPackage rec {
     substituteInPlace t/web-register-open-to-public.t \
       --replace '!127.0.0.1!' '!localhost!'
 
+    # Another online test fails, so remove this.
+    rm t/irc-reconnect.t
+
     # A webirc test fails to resolve "localhost" likely due to sandboxing, we
     # remove this test.
     #
@@ -74,9 +76,9 @@ perlPackages.buildPerlPackage rec {
     AUTO_SHARE_PATH=$out/${perl.libPrefix}/auto/share/dist/Convos
     mkdir -p $AUTO_SHARE_PATH
     cp -vR public assets $AUTO_SHARE_PATH/
-    ln -s $AUTO_SHARE_PATH/public/asset $out/asset
+    ln -s $AUTO_SHARE_PATH/public/assets $out/assets
     cp -vR templates $out/templates
-    cp cpanfile $out/cpanfile
+    cp Makefile.PL $out/Makefile.PL
   '' + lib.optionalString stdenv.isDarwin ''
     shortenPerlShebang $out/bin/convos
   '' + ''