diff options
| author | jeschli <jeschli@gmail.com> | 2019-04-30 19:19:55 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2019-04-30 19:19:55 +0200 |
| commit | 97b78b45a86b9f2a64e8cc56c3cdf9ae98f6c982 (patch) | |
| tree | 4d7f57181227009706e7586f80541dd0666768cd | |
| parent | e45b3492b3961685936378a160adb225789e51d9 (diff) | |
| parent | 222160fc3a195415e859048bdef21f703154b3ee (diff) | |
Merge branch 'master' of prism.r:stockholm
| -rw-r--r-- | krebs/3modules/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/irc-announce/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 734d6c781..10a33d5d7 100644 --- a/krebs/3modules/default.nix +++ b/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 = diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix index e1f4919d5..b22e67535 100644 --- a/krebs/5pkgs/simple/irc-announce/default.nix +++ b/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 |