Author: raskin
Date: Sun Mar 6 15:39:05 2011
New Revision: 26174
URL: https://svn.nixos.org/websvn/nix/?rev=26174&sc=1
Log:
Adding a possibility to add more paths to chroots used by nix-daemons. The
use-case is building the latest version from repository with very large
checkouts. That way you do not get extra copy in store every time you rebuild,
and you can implement a saner version checking than checksumming all the data
Modified:
nixos/trunk/modules/services/misc/nix-daemon.nix
Modified: nixos/trunk/modules/services/misc/nix-daemon.nix
==============================================================================
--- nixos/trunk/modules/services/misc/nix-daemon.nix Sun Mar 6 11:00:29
2011 (r26173)
+++ nixos/trunk/modules/services/misc/nix-daemon.nix Sun Mar 6 15:39:05
2011 (r26174)
@@ -69,6 +69,16 @@
This option allows to append lines to nix.conf.
";
};
+
+ extraChrootPaths = mkOption {
+ default = [];
+ example = ["/var/dist"];
+ description = ''
+ Extra paths to include in chroot. May be useful if you build
+ from private repository mirrors to avoid extra checksumming
+ and copying to store.
+ '';
+ };
distributedBuilds = mkOption {
default = false;
@@ -176,7 +186,6 @@
you should increase this value.
'';
};
-
};
};
@@ -211,7 +220,7 @@
build-users-group = nixbld
build-max-jobs = ${toString (config.nix.maxJobs)}
build-use-chroot = ${if config.nix.useChroot then "true" else
"false"}
- build-chroot-dirs = /dev /dev/pts /proc /bin $(echo
$extraPaths)
+ build-chroot-dirs = /dev /dev/pts /proc /bin $(echo
$extraPaths) ${builtins.toString config.nix.extraChrootPaths}
$extraOptions
END
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
