From e46dcd7074c41d570e7edbc5a8ef159b19c9ebb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 1 Aug 2025 01:47:30 +0200
Subject: [PATCH] prosody: 0.12.5 -> 13.0.2, nixos/prosody: fix startup

Co-authored-by: mirror230469 <215964377+mirror230469@users.noreply.github.com>
---
 nixos/modules/services/networking/prosody.nix | 5 +++--
 pkgs/servers/xmpp/prosody/default.nix         | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 468549281fc8..b46c97f96d81 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -993,11 +993,12 @@ in
         {
           User = cfg.user;
           Group = cfg.group;
-          Type = "forking";
+          Type = "simple";
           RuntimeDirectory = [ "prosody" ];
           PIDFile = "/run/prosody/prosody.pid";
-          ExecStart = "${cfg.package}/bin/prosodyctl start";
+          ExecStart = "${lib.getExe cfg.package} -F";
           ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          Restart = "on-abnormal";
 
           MemoryDenyWriteExecute = true;
           PrivateDevices = true;
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 8b83430d7444..fb90cd5016ae 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -36,7 +36,7 @@ let
   );
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.12.5"; # also update communityModules
+  version = "13.0.2"; # also update communityModules
   pname = "prosody";
   # The following community modules are necessary for the nixos module
   # prosody module to comply with XEP-0423 and provide a working
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   src = fetchurl {
     url = "https://prosody.im/downloads/source/prosody-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-d4+3cHoPEDmVlbp6ucZt0qIojArjp/5Kt4+X1GK9OZ8=";
+    hash = "sha256-PmG9OW83ylJF3r/WvkmkemGRMy8Pqi1O5fAPuwQK3bA=";
   };
 
   # A note to all those merging automated updates: Please also update this
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   # version.
   communityModules = fetchhg {
     url = "https://hg.prosody.im/prosody-modules";
-    rev = "fc521fb5ffa0";
-    hash = "sha256-Ci52Xkx1xd3GW9lBPKgWFBB52SocxKyj8f/Hq3hZeak=";
+    rev = "a4d7fefa4a8b";
+    hash = "sha256-lPxKZlIVyAt1Nx+PQ0ru0qihJ1ecBbvO0fMk+5D+NzE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -114,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.mit;
     homepage = "https://prosody.im";
     platforms = platforms.linux;
+    mainProgram = "prosody";
     maintainers = with maintainers; [
       toastal
       mirror230469