soju: 0.4.0 -> 0.5.2

1 files changed, 35 insertions, 8 deletions

diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix
index dc20578cf021..ae424a1fe50a 100644
--- a/pkgs/applications/networking/soju/default.nix
+++ b/pkgs/applications/networking/soju/default.nix
@@ -1,38 +1,65 @@
-{ lib, buildGoModule, fetchFromSourcehut, installShellFiles, scdoc }:
+{ lib
+, buildGoModule
+, fetchFromSourcehut
+, installShellFiles
+, scdoc
+}:
 
 buildGoModule rec {
   pname = "soju";
-  version = "0.4.0";
+  version = "0.5.2";
 
   src = fetchFromSourcehut {
     owner = "~emersion";
     repo = "soju";
     rev = "v${version}";
-    sha256 = "sha256-4ixPEnSa1m52Hu1dzxMG8c0bkqGN04vRlIzvdZ/ES4A=";
+    hash = "sha256-lpLWqaSFx/RJg73n5XNN/qUXHfZsBkbABoYcgxpK3rU=";
   };
 
-  vendorSha256 = "sha256-UVFi/QK2zwzhBkPXEJLYc5WSu3OOvWTVVGkMhrrufyc=";
+  vendorHash = "sha256-n1wwi7I2hDLOe08RkJOiopDUGI6uhipNpBdeOLARIoU=";
 
   subPackages = [
     "cmd/soju"
     "cmd/sojuctl"
-    "contrib/znc-import.go"
+    "contrib/migrate-db"
+    "contrib/znc-import"
   ];
 
   nativeBuildInputs = [
-    scdoc
     installShellFiles
+    scdoc
   ];
 
+  ldflags = [ "-s" "-w" ];
+
+  postBuild = ''
+    make doc/soju.1
+  '';
+
   postInstall = ''
-    scdoc < doc/soju.1.scd > doc/soju.1
     installManPage doc/soju.1
   '';
 
+  preCheck = ''
+    # Test all targets.
+    unset subPackages
+
+    # Disable a test that requires an additional service.
+    rm database/postgres_test.go
+  '';
+
   meta = with lib; {
     description = "A user-friendly IRC bouncer";
+    longDescription = ''
+      soju is a user-friendly IRC bouncer. soju connects to upstream IRC servers
+      on behalf of the user to provide extra functionality. soju supports many
+      features such as multiple users, numerous IRCv3 extensions, chat history
+      playback and detached channels. It is well-suited for both small and large
+      deployments.
+    '';
     homepage = "https://soju.im";
+    changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ malvo ];
+    maintainers = with maintainers; [ azahi malvo ];
   };
 }