diff options
| author | lassulus <lassulus@lassul.us> | 2021-05-24 15:49:57 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-06-16 02:09:00 +0200 |
| commit | 0a8684caddccb10f7f8e1470d8d7b5b952c837d7 (patch) | |
| tree | 733278279fb051fe683a7116fa7ba8a4078dc4c0 | |
| parent | Merge pull request #127009 from NixOS/backport-125890-to-release-21.05 (diff) | |
| download | nixpkgs-0a8684caddccb10f7f8e1470d8d7b5b952c837d7.tar.gz | |
solanum: remove obsolete BANDB settings/patches
(cherry picked from commit 8eb5701aaf0eb7ad842a67f09e2f80826ac1ce80)
| -rw-r--r-- | nixos/modules/services/networking/solanum.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/irc/solanum/bandb.patch | 12 | ||||
| -rw-r--r-- | pkgs/servers/irc/solanum/default.nix | 1 |
3 files changed, 0 insertions, 16 deletions
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 2fa85072854a..b6678271c31f 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 ]; postPatch = '' |