summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-11-02 20:26:53 +0100
committerlassulus <lass@aidsballs.de>2016-11-02 20:26:53 +0100
commitbe75882a3b9ad9b6cab14be73f551c4f9dafce39 (patch)
tree4c37efc17a0d2b99ed7da8d4f3edf6d93bbe8042
parentf4007fc84d0ae7ddf3726dae433d403b7502564b (diff)
parent09fac6376315022edb27d53974d9c31eb672badb (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--makefu/2configs/default.nix1
-rw-r--r--makefu/2configs/tinc/retiolum.nix3
2 files changed, 3 insertions, 1 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index bbe108074..db69be2fa 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -10,7 +10,6 @@ with import <stockholm/lib>;
}
./vim.nix
./binary-cache/nixos.nix
- ./binary-cache/lass.nix
];
nixpkgs.config.allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name);
diff --git a/makefu/2configs/tinc/retiolum.nix b/makefu/2configs/tinc/retiolum.nix
index dcb072461..c55b94466 100644
--- a/makefu/2configs/tinc/retiolum.nix
+++ b/makefu/2configs/tinc/retiolum.nix
@@ -1,4 +1,7 @@
_:
{
+ imports = [
+ ../binary-cache/lass.nix
+ ];
krebs.tinc.retiolum.enable = true;
}