lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

local repo fixups after bump of nixpkgs

Browse source
This commit is contained in:
Luke Granger-Brown 2020-06-06 13:12:39 +01:00
parent e7f069c37c
commit 15c82b0498
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/pkgs/copybara.nix
View file

@ -17,7 +17,7 @@ pkgs.buildBazelPackage rec {
]; ];
fetchAttrs = { fetchAttrs = {
sha256 = "1mcb2l0zv52smkj076d3s3jnv80qn8nasv99vshgpbpgqqs39hk3"; sha256 = "1nlkkhk7w8lnh3s416w1g1jc4qsirrgb0fggqhqamlpjr1xiv1v5";
preHook = '' preHook = ''
export COURSIER_CACHE="$(echo ''${NIX_BUILD_TOP}/tmp/coursier | sed -e 's,//,/,g')" export COURSIER_CACHE="$(echo ''${NIX_BUILD_TOP}/tmp/coursier | sed -e 's,//,/,g')"
''; '';

5
ops/nixos/lib/zfs.nix
View file

@ -13,6 +13,10 @@ in
type = types.str; type = types.str;
default = "zpool/local/root@blank"; default = "zpool/local/root@blank";
}; };
keepPaths = mkOption {
type = types.listOf types.str;
default = [ ];
};
}; };
config = { config = {
@ -23,6 +27,7 @@ in
enable = true; enable = true;
monthly = 1; monthly = 1;
}; };
systemd.tmpfiles.rules = lib.mkAfter (builtins.map (x: "L ${x} - - - - /persist{x}") robCfg.keepPaths);
boot.initrd.postDeviceCommands = mkIf robCfg.enable boot.initrd.postDeviceCommands = mkIf robCfg.enable
(mkAfter '' (mkAfter ''