diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-05-20 20:05:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-20 20:05:49 +0200 |
| commit | 108a8bde630de25ab7bc05bc76dced1833415250 (patch) | |
| tree | c929c17d8464574e5ea8bd54390a455d4401a2a1 /pkgs/servers | |
| parent | d2faff3f67f7d08db616afd91c48f94a9493f4f1 (diff) | |
| parent | 3cbc9824a35f344f2ecde4068164d56fbeec84c0 (diff) | |
Merge pull request #123643 from Lassulus/solanum
solanum: 2020-12-14 -> 2021-04-27
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/irc/solanum/bandb.patch | 12 | ||||
| -rw-r--r-- | pkgs/servers/irc/solanum/default.nix | 21 |
2 files changed, 24 insertions, 9 deletions
diff --git a/pkgs/servers/irc/solanum/bandb.patch b/pkgs/servers/irc/solanum/bandb.patch new file mode 100644 index 0000000000000..7d204398b9916 --- /dev/null +++ b/pkgs/servers/irc/solanum/bandb.patch @@ -0,0 +1,12 @@ +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 1d39526ed1ee3..2d9035259a629 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -1,27 +1,29 @@ { lib, stdenv -, fetchFromGitHub , autoreconfHook -, pkg-config , bison +, fetchFromGitHub , flex +, lksctp-tools , openssl +, pkg-config , sqlite -, lksctp-tools +, util-linux }: stdenv.mkDerivation rec { pname = "solanum"; - version = "unstable-2020-12-14"; + version = "unstable-2021-04-27"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = pname; - rev = "551e5a146eab4948ce4a57d87a7f671f2d7cc02d"; - sha256 = "14cd2cb04w6nwck7q49jw5zvifkzhkmblwhjfskc2nxcdb5x3l96"; + rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925"; + sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f"; }; patches = [ ./dont-create-logdir.patch + ./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156 ]; configureFlags = [ @@ -29,9 +31,9 @@ stdenv.mkDerivation rec { "--enable-ipv6" "--enable-openssl=${openssl.dev}" "--with-program-prefix=solanum-" - "--localstatedir=/var/lib/solanum" - "--with-rundir=/run/solanum" - "--with-logdir=/var/log/solanum" + "--localstatedir=/var/lib" + "--with-rundir=/run" + "--with-logdir=/var/log" ] ++ lib.optionals (stdenv.isLinux) [ "--enable-sctp=${lksctp-tools.out}/lib" ]; @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { bison flex pkg-config + util-linux ]; buildInputs = [ |