diff options
| author | tv <tv@shackspace.de> | 2015-10-01 17:16:57 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-10-01 17:16:57 +0200 |
| commit | cd61f94ba02c485327547ace8cd28a22e38bfe0f (patch) | |
| tree | eb3ace527780b9e5b66cb7517e9bee6a61bd8e66 /makefu/1systems/pnp.nix | |
| parent | 24326956780833540fd65dd0cb750c1071fa51b9 (diff) | |
| parent | d9f4d621bcde5ddc983a922e378657dba1f6e141 (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/1systems/pnp.nix')
| -rw-r--r-- | makefu/1systems/pnp.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 2dce87d5d..7698ea14d 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -9,6 +9,7 @@ [ # Include the results of the hardware scan. # Base ../2configs/base.nix + ../2configs/base-sources.nix ../2configs/tinc-basic-retiolum.nix # HW/FS @@ -31,6 +32,10 @@ ]; krebs.Reaktor.enable = true; krebs.Reaktor.debug = true; + krebs.Reaktor.nickname = "Reaktor|bot"; + krebs.Reaktor.extraEnviron = { + REAKTOR_CHANNELS = "#krebs,#binaergewitter"; + }; krebs.build.host = config.krebs.hosts.pnp; krebs.build.user = config.krebs.users.makefu; @@ -38,12 +43,6 @@ nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; - krebs.build.deps = { - nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - rev = "03921972268934d900cc32dad253ff383926771c"; - }; - }; networking.firewall.allowedTCPPorts = [ # nginx runs on 80 |