diff options
author | makefu <github@syntax-fehler.de> | 2015-09-27 19:30:37 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-09-27 19:30:37 +0200 |
commit | 5038c65ab0e097af4d7c8b047b1f64eb5f7fabea (patch) | |
tree | d5452c62e4b91db44cf5dd27a92edc77105d2f56 /makefu/2configs | |
parent | dec3f4a2114309be67413e2fd32a4888a74da2e3 (diff) |
merge in new sources definition
Diffstat (limited to 'makefu/2configs')
-rw-r--r-- | makefu/2configs/base-sources.nix | 19 | ||||
-rw-r--r-- | makefu/2configs/base.nix | 9 |
2 files changed, 19 insertions, 9 deletions
diff --git a/makefu/2configs/base-sources.nix b/makefu/2configs/base-sources.nix new file mode 100644 index 000000000..a2715ba4c --- /dev/null +++ b/makefu/2configs/base-sources.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +{ + krebs.build.source = { + git.nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + #url = https://github.com/makefu/nixpkgs; + rev = "68bd8e4a9dc247726ae89cc8739574261718e328"; + }; + dir.secrets = { + host = config.krebs.hosts.pornocauster; + path = "/home/makefu/secrets/${config.krebs.build.host.name}/"; + }; + dir.stockholm = { + host = config.krebs.hosts.pornocauster; + path = toString ../.. ; + }; + }; +} diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix index a5c64f4f3..34b413024 100644 --- a/makefu/2configs/base.nix +++ b/makefu/2configs/base.nix @@ -37,15 +37,6 @@ with lib; time.timeZone = "Europe/Berlin"; #nix.maxJobs = 1; - krebs.build.deps = { - secrets = { - url = "/home/makefu/secrets/${config.krebs.build.host.name}"; - }; - stockholm = { - url = toString ../..; - }; - }; - services.openssh.enable = true; nix.useChroot = true; |