From 0f56042556eef90c0ffcde1a36974d2a7085bd98 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 14:51:39 +0200
Subject: [PATCH] inspircd: 3.18.0 -> 4.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://docs.inspircd.org/4/breaking-changes/
https://docs.inspircd.org/4/overview/

https://docs.inspircd.org/4/change-log/#inspircd-401
https://docs.inspircd.org/4/change-log/#inspircd-410
https://docs.inspircd.org/4/change-log/#inspircd-420
https://docs.inspircd.org/4/change-log/#inspircd-430
https://docs.inspircd.org/4/change-log/#inspircd-440
https://docs.inspircd.org/4/change-log/#inspircd-450
https://docs.inspircd.org/4/change-log/#inspircd-460
https://docs.inspircd.org/4/change-log/#inspircd-470

Packaging-relevant changes:

- inspircd no longer has the start subcommand, but needs to be invoked
  directly.
- New extra modules: log_syslog and log_json
- Removed extra modules: regex_tre, regex_pcre, ssl_mbedtls
  You probably should not use them anymore, but they can be
  obtained via the module manager in theory — though I doubt it works
  with Nix (another item for the todo list, I guess):
  https://docs.inspircd.org/4/module-manager/
---
 doc/release-notes/rl-2511.section.md           |  2 ++
 nixos/modules/services/networking/inspircd.nix |  2 +-
 pkgs/by-name/in/inspircd/package.nix           | 17 +++++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index bb8943416017..332ae0b71aa1 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -47,6 +47,8 @@
   The binary name remains `webfontkitgenerator`.
   The `webfontkitgenerator` package is an alias to `webfont-bundler`.
 
+- `inspircd` has been updated to the v4 release series. Please refer to the upstream documentation for [general information](https://docs.inspircd.org/4/overview/#v4-overview) and a list of [breaking changes](https://docs.inspircd.org/4/breaking-changes/).
+
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
 
 - `vmware-horizon-client` was renamed to `omnissa-horizon-client`, following [VMware's sale of their end-user business to Omnissa](https://www.omnissa.com/insights/introducing-omnissa-the-former-vmware-end-user-computing-business/). The binary has been renamed from `vmware-view` to `horizon-client`.
diff --git a/nixos/modules/services/networking/inspircd.nix b/nixos/modules/services/networking/inspircd.nix
index 5ae169dd4155..315a327bc36e 100644
--- a/nixos/modules/services/networking/inspircd.nix
+++ b/nixos/modules/services/networking/inspircd.nix
@@ -59,7 +59,7 @@ in
       serviceConfig = {
         Type = "simple";
         ExecStart = ''
-          ${lib.getBin cfg.package}/bin/inspircd start --config ${configFile} --nofork --nopid
+          ${lib.getBin cfg.package}/bin/inspircd --config ${configFile} --nofork --nopid
         '';
         DynamicUser = true;
       };
diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index caf666705e90..add41960449f 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -31,6 +31,7 @@ let
 
   # compatible if libc is compatible
   libcModules = [
+    "log_syslog"
     "regex_posix"
     "sslrehashsignal"
   ];
@@ -50,12 +51,11 @@ let
       # GPLv2 compatible dependencies
       "argon2"
       "ldap"
+      "log_json"
       "mysql"
       "pgsql"
-      "regex_pcre"
       "regex_pcre2"
       "regex_re2"
-      "regex_tre"
       "sqlite3"
       "ssl_gnutls"
     ]
@@ -74,15 +74,13 @@ in
   openldap,
   libpq,
   libmysqlclient,
-  pcre,
   pcre2,
-  tre,
   re2,
   sqlite,
   gnutls,
   libmaxminddb,
   openssl,
-  mbedtls,
+  yyjson,
   # For a full list of module names, see https://docs.inspircd.org/packaging/
   extraModules ? compatibleModules lib stdenv,
 }:
@@ -104,12 +102,12 @@ let
       )
     ];
     ldap = [ openldap ];
+    log_json = [ yyjson ];
+    log_syslog = [ ];
     mysql = [ libmysqlclient ];
     pgsql = [ libpq ];
-    regex_pcre = [ pcre ];
     regex_pcre2 = [ pcre2 ];
     regex_re2 = [ re2 ];
-    regex_tre = [ tre ];
     sqlite3 = [ sqlite ];
     ssl_gnutls = [ gnutls ];
     # depends on stdenv.cc.libc
@@ -119,7 +117,6 @@ let
     regex_stdlib = [ ];
     # GPLv2 incompatible
     geo_maxmind = [ libmaxminddb ];
-    ssl_mbedtls = [ mbedtls ];
     ssl_openssl = [ openssl ];
   };
 
@@ -151,13 +148,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "inspircd";
-  version = "3.18.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "inspircd";
     repo = "inspircd";
     rev = "v${version}";
-    sha256 = "sha256-Aulhg2CbtcpsxkH5kXkp4EoZF5/F9pOXJc1S08S5P08=";
+    sha256 = "sha256-/LiniV5moKGX7K6Hfzq1mxEBZ+sqnScQxT0AApiBPaA=";
   };
 
   outputs = [