summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/vbob.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-16 17:15:00 +0100
committerlassulus <lass@aidsballs.de>2016-02-16 17:15:00 +0100
commit0b0b0d65ee05583529df831985580e392713d29a (patch)
tree7eb6799a996924d8e895c54633a47ea3d7a92a4c /makefu/1systems/vbob.nix
parent3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff)
parentb7a92f63884af00eb0243ec9328be689a6c9b845 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'makefu/1systems/vbob.nix')
-rw-r--r--makefu/1systems/vbob.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 90b49080..e07525d0 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -4,9 +4,9 @@
{ lib, config, pkgs, ... }:
{
krebs.build.host = config.krebs.hosts.vbob;
- krebs.build.target = "root@10.10.10.220";
imports =
[ # Include the results of the hardware scan.
+ ../.
<nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>
../2configs/main-laptop.nix #< base-gui
@@ -18,8 +18,8 @@
tinc = pkgs.tinc_pre;
};
- krebs.build.source.nixpkgs = {
- # url = https://github.com/nixos/nixpkgs;
+ krebs.build.source.upstream-nixpkgs = {
+ url = https://github.com/makefu/nixpkgs;
# HTTP Everywhere + libredir
rev = "8239ac6";
};
@@ -39,7 +39,6 @@
buildbot
buildbot-slave
get
- genid
logstash
];