summaryrefslogtreecommitdiffstats
path: root/tv/2configs/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-10-06 19:16:42 +0200
committertv <tv@krebsco.de>2016-10-08 09:30:51 +0200
commit58c854c657b0bcbfc7e34b743cdba18675221e32 (patch)
treeb524d733f2caabd287ea8a28190651da7c610aa8 /tv/2configs/default.nix
parentd3f2444f91162b7dd22c92c8093795736aa11a11 (diff)
tv nixpkgs: 2568ee3 -> 45b2a6d
Diffstat (limited to 'tv/2configs/default.nix')
-rw-r--r--tv/2configs/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index db1bfe5a..7d454e2b 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with config.krebs.lib;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "2568ee3d73bdebd6bab6739adf8a900f3429c8e6";
+ ref = "45b2a6d88299bb5671e36a4239ec0097bc149fb3";
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
@@ -37,6 +37,7 @@ with config.krebs.lib;
# stockholm dependencies
environment.systemPackages = with pkgs; [
git
+ populate
];
}
{
@@ -63,13 +64,13 @@ with config.krebs.lib;
{
# TODO check if both are required:
- nix.chrootDirs = [ "/etc/protocols" pkgs.iana_etc.outPath ];
+ nix.sandboxPaths = [ "/etc/protocols" pkgs.iana_etc.outPath ];
nix.requireSignedBinaryCaches = true;
nix.binaryCaches = ["https://cache.nixos.org"];
- nix.useChroot = true;
+ nix.useSandbox = true;
}
{
nixpkgs.config.allowUnfree = false;