summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-05-12 23:11:59 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-05-12 23:11:59 +0200
commit8d2ff5312e4b056fe892a6345fe3afa8ee99b3de (patch)
treebd20147e26647fe3d42558574c31145fcbf6a43d
parentdd1e2ffa91bd28515ea9aeadfa38842896a6a560 (diff)
downloadnixos-8d2ff5312e4b056fe892a6345fe3afa8ee99b3de.tar
nixos-8d2ff5312e4b056fe892a6345fe3afa8ee99b3de.tar.gz
nixos-8d2ff5312e4b056fe892a6345fe3afa8ee99b3de.tar.bz2
nixos-8d2ff5312e4b056fe892a6345fe3afa8ee99b3de.tar.xz
nixos-8d2ff5312e4b056fe892a6345fe3afa8ee99b3de.zip
callPackage can’t work
-rw-r--r--custom/tinc/yggdrasil.nix1
-rw-r--r--hel.nix3
2 files changed, 2 insertions, 2 deletions
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 975d4a3d..5fa76fe1 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -4,7 +4,6 @@
4, name 4, name
5, connect ? true 5, connect ? true
6, ipConf ? {} 6, ipConf ? {}
7, ...
8}: 7}:
9 8
10 9
diff --git a/hel.nix b/hel.nix
index 2222cc9f..84b2c50c 100644
--- a/hel.nix
+++ b/hel.nix
@@ -83,7 +83,8 @@
83 ntp.enable = false; 83 ntp.enable = false;
84 timesyncd.enable = true; 84 timesyncd.enable = true;
85 85
86 customTinc.networks = (pkgs.callPackage ./custom/tinc/yggdrasil.nix { 86 customTinc.networks = ((import ./custom/tinc/yggdrasil.nix) {
87 inherit (pkgs) stdenv nettools openresolv;
87 name = "hel"; 88 name = "hel";
88 ipConf = { 89 ipConf = {
89 ip4 = [ { address = "10.141.5.1"; prefixLength = 16; } ]; 90 ip4 = [ { address = "10.141.5.1"; prefixLength = 16; } ];