From 8eb5701aaf0eb7ad842a67f09e2f80826ac1ce80 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 24 May 2021 15:49:57 +0200
Subject: [PATCH] solanum: remove obsolete BANDB settings/patches

---
 nixos/modules/services/networking/solanum.nix |  3 ---
 pkgs/servers/irc/solanum/bandb.patch          | 12 ------------
 pkgs/servers/irc/solanum/default.nix          |  1 -
 3 files changed, 16 deletions(-)
 delete mode 100644 pkgs/servers/irc/solanum/bandb.patch

diff --git a/nixos/modules/services/networking/solanum.nix b/nixos/modules/services/networking/solanum.nix
index 989621b204ce..b6496fb8b35a 100644
--- a/nixos/modules/services/networking/solanum.nix
+++ b/nixos/modules/services/networking/solanum.nix
@@ -82,9 +82,6 @@ in
         description = "Solanum IRC daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        environment = {
-          BANDB_DBPATH = "/var/lib/solanum/ban.db";
-        };
         serviceConfig = {
           ExecStart   = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile ${configFile} -pidfile /run/solanum/ircd.pid";
           DynamicUser = true;
diff --git a/pkgs/servers/irc/solanum/bandb.patch b/pkgs/servers/irc/solanum/bandb.patch
deleted file mode 100644
index 7d204398b991..000000000000
--- a/pkgs/servers/irc/solanum/bandb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/ircd/bandbi.c b/ircd/bandbi.c
-index 29a3bfa2..16a40f17 100644
---- a/ircd/bandbi.c
-+++ b/ircd/bandbi.c
-@@ -83,7 +83,6 @@ start_bandb(void)
- 	const char *suffix = "";
- #endif
- 
--	rb_setenv("BANDB_DBPATH", ircd_paths[IRCD_PATH_BANDB], 1);
- 	if(bandb_path == NULL)
- 	{
- 		snprintf(fullpath, sizeof(fullpath), "%s%cbandb%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix);
diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix
index 2d9035259a62..8080d82a185f 100644
--- a/pkgs/servers/irc/solanum/default.nix
+++ b/pkgs/servers/irc/solanum/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./dont-create-logdir.patch
-    ./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
   ];
 
   configureFlags = [