Merge branch 'master' of prism.r:stockholm

krebs/3modules/default.nix

@@ -132,7 +132,7 @@ let
 
       services.openssh.hostKeys =
         let inherit (config.krebs.build.host.ssh) privkey; in
-        mkIf (privkey != null) (mkForce [privkey]);
+        mkIf (privkey != null) [privkey];
 
       # TODO use imports for merging
       services.openssh.knownHosts =

krebs/5pkgs/simple/irc-announce/default.nix

@@ -15,7 +15,7 @@ pkgs.writeDashBin "irc-announce" ''
 
   IRC_SERVER=$1
   IRC_PORT=$2
-  IRC_NICK=$3$$
+  IRC_NICK=$3_$$
   IRC_CHANNEL=$4
   message=$5