summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-03 22:30:11 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-03 22:30:11 +0100
commite5d8a20a847021784666e6fa94cd58155ab406f7 (patch)
treec5cce8abe3a95c09de68933b18df1a5432eee5f1
parenta3e3918003c8808346c550717edd17df1bb2b36d (diff)
downloadnixos-e5d8a20a847021784666e6fa94cd58155ab406f7.tar
nixos-e5d8a20a847021784666e6fa94cd58155ab406f7.tar.gz
nixos-e5d8a20a847021784666e6fa94cd58155ab406f7.tar.bz2
nixos-e5d8a20a847021784666e6fa94cd58155ab406f7.tar.xz
nixos-e5d8a20a847021784666e6fa94cd58155ab406f7.zip
syntax poking
-rw-r--r--ymir.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/ymir.nix b/ymir.nix
index ef01d781..9b8ea898 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -140,11 +140,12 @@ in {
140 members = [ "gkleen" 140 members = [ "gkleen"
141 ]; 141 ];
142 }; 142 };
143} // (callPackage ./custom/tinc/yggdrasil.nix ({ 143} // ((import ./custom/tinc/yggdrasil.nix) {
144 inherit config pkgs;
144 name = "ymir"; 145 name = "ymir";
145 ip = { 146 ip = {
146 ip4 = [ 147 ip4 = [
147 { address = "10.141.4.1"; prefixLength = 16; } 148 { address = "10.141.4.1"; prefixLength = 16; }
148 ]; 149 ];
149 }; 150 };
150})) 151})