Merge remote-tracking branch 'gum/master'

2016-11-02 20:26:53 +01:00 · 2016-11-02 20:26:53 +01:00 · be75882a3b
commit be75882a3b
parent f4007fc84d 09fac63763
2 changed files with 3 additions and 1 deletions
--- 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);
--- 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;
 }