From 5b0d9c044739759e5d055c6a8d0b566ddd77c9be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 Jan 2026 13:58:48 +0100 Subject: [PATCH] charybdis, nixos/charybdis: drop The charybdis-ircd project was archived in June 2021 and replaced by Solanum, which we have been providing since May 2021. --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 4 + .../modules/services/networking/charybdis.nix | 126 ------------------ pkgs/by-name/ch/charybdis/package.nix | 63 --------- pkgs/top-level/aliases.nix | 1 + 5 files changed, 5 insertions(+), 190 deletions(-) delete mode 100644 nixos/modules/services/networking/charybdis.nix delete mode 100644 pkgs/by-name/ch/charybdis/package.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index af7ea9aa5a6d..3046b73f731b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1128,7 +1128,6 @@ ./services/networking/cato-client.nix ./services/networking/centrifugo.nix ./services/networking/cgit.nix - ./services/networking/charybdis.nix ./services/networking/chisel-server.nix ./services/networking/cjdns.nix ./services/networking/clatd.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0a661c984c2c..d2152082a042 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -139,6 +139,10 @@ in "cgmanager" "enable" ] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") + (mkRemovedOptionModule [ + "services" + "charybdis" + ] "The charybdis module has been removed, the project was archived in 2021.") (mkRemovedOptionModule [ "services" "chatgpt-retrieval-plugin" diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix deleted file mode 100644 index 9f07abfdeadb..000000000000 --- a/nixos/modules/services/networking/charybdis.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - inherit (lib) - mkEnableOption - mkIf - mkOption - singleton - types - ; - inherit (pkgs) coreutils charybdis; - cfg = config.services.charybdis; - - configFile = pkgs.writeText "charybdis.conf" '' - ${cfg.config} - ''; -in - -{ - - ###### interface - - options = { - - services.charybdis = { - - enable = mkEnableOption "Charybdis IRC daemon"; - - config = mkOption { - type = types.str; - description = '' - Charybdis IRC daemon configuration file. - ''; - }; - - statedir = mkOption { - type = types.path; - default = "/var/lib/charybdis"; - description = '' - Location of the state directory of charybdis. - ''; - }; - - user = mkOption { - type = types.str; - default = "ircd"; - description = '' - Charybdis IRC daemon user. - ''; - }; - - group = mkOption { - type = types.str; - default = "ircd"; - description = '' - Charybdis IRC daemon group. - ''; - }; - - motd = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - Charybdis MOTD text. - - Charybdis will read its MOTD from /etc/charybdis/ircd.motd . - If set, the value of this option will be written to this path. - ''; - }; - - }; - - }; - - ###### implementation - - config = mkIf cfg.enable ( - lib.mkMerge [ - { - users.users.${cfg.user} = { - description = "Charybdis IRC daemon user"; - uid = config.ids.uids.ircd; - group = cfg.group; - }; - - users.groups.${cfg.group} = { - gid = config.ids.gids.ircd; - }; - - systemd.tmpfiles.settings."10-charybdis".${cfg.statedir}.d = { - inherit (cfg) user group; - }; - - environment.etc."charybdis/ircd.conf".source = configFile; - - systemd.services.charybdis = { - description = "Charybdis IRC daemon"; - wantedBy = [ "multi-user.target" ]; - reloadIfChanged = true; - restartTriggers = [ - configFile - ]; - environment = { - BANDB_DBPATH = "${cfg.statedir}/ban.db"; - }; - serviceConfig = { - ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile /etc/charybdis/ircd.conf"; - ExecReload = "${coreutils}/bin/kill -HUP $MAINPID"; - Group = cfg.group; - User = cfg.user; - }; - }; - - } - - (mkIf (cfg.motd != null) { - environment.etc."charybdis/ircd.motd".text = cfg.motd; - }) - ] - ); -} diff --git a/pkgs/by-name/ch/charybdis/package.nix b/pkgs/by-name/ch/charybdis/package.nix deleted file mode 100644 index 714d68cd0610..000000000000 --- a/pkgs/by-name/ch/charybdis/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - autoreconfHook, - bison, - flex, - openssl, - gnutls, -}: - -stdenv.mkDerivation rec { - pname = "charybdis"; - version = "4.1.2"; - - src = fetchFromGitHub { - owner = "charybdis-ircd"; - repo = "charybdis"; - rev = "${pname}-${version}"; - sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3"; - }; - - patches = [ - (fetchurl { - url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/d13eb723d7e9512fb2f2516e5934bd927a92eb2c/community/charybdis/fix-missing-include.patch"; - hash = "sha256-8JXYuIjoHQg+l33OjseF5nnd5ZPagBA2/bSa3Il5Te4="; - }) - ]; - - postPatch = '' - substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' - substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/charybdis' - ''; - - autoreconfPhase = "sh autogen.sh"; - - configureFlags = [ - "--enable-epoll" - "--enable-ipv6" - "--enable-openssl=${openssl.dev}" - "--with-program-prefix=charybdis-" - ]; - - nativeBuildInputs = [ - autoreconfHook - bison - flex - ]; - buildInputs = [ - openssl - gnutls - ]; - - meta = { - description = "IRCv3 server designed to be highly scalable"; - homepage = "https://github.com/charybdis-ircd/charybdis"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ lassulus ]; - platforms = lib.platforms.unix; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c9074c59caf8..30f4b02d58f5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -409,6 +409,7 @@ mapAliases { certmgr-selfsigned = throw "'certmgr-selfsigned' has been renamed to/replaced by 'certmgr'"; # Converted to throw 2025-10-27 challenger = throw "'challenger' has been renamed to/replaced by 'taler-challenger'"; # Converted to throw 2025-10-27 charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18 + charybdis = throw "charybdis was removed since its upstream repo was archived in 2021"; # Added 2026-01-13 chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 check-esxi-hardware = throw "'check-esxi-hardware' has been renamed to/replaced by 'nagiosPlugins.check_esxi_hardware'"; # Converted to throw 2025-10-27 check-mssql-health = throw "'check-mssql-health' has been renamed to/replaced by 'nagiosPlugins.check_mssql_health'"; # Converted to throw 2025-10-27