diff options
| author | lassulus <lass@aidsballs.de> | 2015-12-16 15:46:23 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-12-16 15:46:23 +0100 |
| commit | 07f4510ad0bff0f9d72e5dcee279a30a0d5f8da3 (patch) | |
| tree | 5848f7727500895df71a523a3405087448ba9e4a /makefu/1systems/pornocauster.nix | |
| parent | d94784efbecbd437ec6268bb9bfca57a8088d6e8 (diff) | |
| parent | 8f18b00ab141df92b7df4725a18bb3283b184d76 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 977289470..28b77d330 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -6,14 +6,12 @@ { imports = [ # Include the results of the hardware scan. - ../2configs/main-laptop.nix #< base-gui + ../2configs/main-laptop.nix #< base-gui + zsh # Krebs ../2configs/tinc-basic-retiolum.nix #../2configs/disable_v6.nix - # environment - ../2configs/zsh-user.nix # applications @@ -36,11 +34,17 @@ # ../2configs/mediawiki.nix #../2configs/wordpress.nix ]; - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; + nixpkgs.config.packageOverrides = pkgs: { + tinc = pkgs.tinc_pre; + buildbot = let + pkgs1509 = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {}; + in pkgs1509.buildbot; + }; + makefu.buildbot.master.enable = true; + #krebs.Reaktor.enable = true; #krebs.Reaktor.nickname = "makefu|r"; - - krebs.build.host = config.krebs.hosts.pornocauster; + # nix.binaryCaches = [ "http://acng.shack/nixos" "https://cache.nixos.org" ]; environment.systemPackages = with pkgs;[ get @@ -58,4 +62,5 @@ 25 ]; + krebs.build.host = config.krebs.hosts.pornocauster; } |