From d98578e3e190463a341a94f2cc778ef886f9252d Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 8 Feb 2016 01:07:03 +0100 Subject: rm krebs.build.target --- makefu/1systems/vbob.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'makefu/1systems/vbob.nix') diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 90b49080..20301795 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -4,7 +4,6 @@ { 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. -- cgit v1.2.3 From 28ea7e3745540c432b03d387ad2193a134a1eed4 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 10 Feb 2016 15:34:41 +0100 Subject: ma 1 vbob: deployable again --- makefu/1systems/vbob.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'makefu/1systems/vbob.nix') diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index f4a22d72..b1e5ef8b 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -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 ]; -- cgit v1.2.3 From 8f520b19b623919fa6319029a955d43fd051773c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 15 Feb 2016 16:27:11 +0100 Subject: don't try to mimic nixpkgs --- makefu/1systems/vbob.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu/1systems/vbob.nix') diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 2dee8372..e07525d0 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -6,6 +6,7 @@ krebs.build.host = config.krebs.hosts.vbob; imports = [ # Include the results of the hardware scan. + ../. ../2configs/main-laptop.nix #< base-gui -- cgit v1.2.3