diff options
| author | lassulus <lassulus@lassul.us> | 2020-11-18 00:12:13 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-11-18 00:12:13 +0100 |
| commit | 7f11cf509f9e1595628582522d4d0acaea748608 (patch) | |
| tree | 16ac0aa95945059afbfe7d581c3dda452d715a1b /krebs | |
| parent | 3b71444dbf0d37472c4f146f17c8cd3eafe505ec (diff) | |
| parent | 60e1c9a6a7479dd588993eb55048cd3f1e711c01 (diff) | |
Merge remote-tracking branch 'gum/20.09' into 20.09
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 11 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 0cadc3a10..9ee61c6f8 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -14,12 +14,17 @@ <stockholm/krebs/2configs/binary-cache/nixos.nix> <stockholm/krebs/2configs/binary-cache/prism.nix> + + ### Krebs ### <stockholm/krebs/2configs/go.nix> + + #### NEWS #### <stockholm/krebs/2configs/ircd.nix> - <stockholm/krebs/2configs/news.nix> - <stockholm/krebs/2configs/news-spam.nix> + #<stockholm/krebs/2configs/news.nix> + #<stockholm/krebs/2configs/news-spam.nix> + - ### shackspace + ### shackspace ### # handle the worlddomination map via coap <stockholm/krebs/2configs/shack/worlddomination.nix> <stockholm/krebs/2configs/shack/ssh-keys.nix> diff --git a/krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix b/krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix index a84407457..79a1740fd 100644 --- a/krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix +++ b/krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "09cciml1j8x76jpm2v5v6h2q6j1fkhsz1kswslmx8wl4wk40xgp4"; }; - vendorSha256 = "0nlnxkpcna7g7qslyz5i1619paw4jkb1ma4fgpsgvgx1spwrjm8h"; + vendorSha256 = "1v0fgin8dn81b559zz4lqmrl7hikr46g4gb18sci4riql5qs1isj"; postInstall = '' install -D ./default.tmpl $out/templates/default.tmpl ''; |