public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #127011 from NixOS/backport-125011-to-release-21.05

Browse Source 
[Backport release-21.05] solanum: fix MOTD
This commit is contained in:
Martin Weinelt 2021-06-16 00:56:51 +02:00 committed by GitHub
commit 225f11b219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/tests/solanum.nix
View File

@ -16,6 +16,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
networking.firewall.allowedTCPPorts = [ ircPort ]; networking.firewall.allowedTCPPorts = [ ircPort ];
services.solanum = { services.solanum = {
enable = true; enable = true;
motd = ''
The default MOTD doesn't contain the word "nixos" in it.
This one does.
'';
}; };
}; };
} // lib.listToAttrs (builtins.map (client: lib.nameValuePair client { } // lib.listToAttrs (builtins.map (client: lib.nameValuePair client {
@ -48,6 +52,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
${client}.wait_for_unit("ii") ${client}.wait_for_unit("ii")
${client}.wait_for_file("${iiDir}/${server}/out") ${client}.wait_for_file("${iiDir}/${server}/out")
'' ''
# look for the custom text in the MOTD.
''
${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out")
''
# wait until first PING from server arrives before joining, # wait until first PING from server arrives before joining,
# so we don't try it too early # so we don't try it too early
'' ''

4
pkgs/servers/irc/solanum/default.nix
View File

@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156 ./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
]; ];
postPatch = ''
substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum'
'';
configureFlags = [ configureFlags = [
"--enable-epoll" "--enable-epoll"
"--enable-ipv6" "--enable-ipv6"