7 commits

Author	SHA1	Message	Date
Eelco Dolstra	d16fd24973	Allow shorter syntax for chroot stores ... You can now say '--store /tmp/nix' instead of '--store local?root=/tmp/nix'.	2017-10-24 15:32:38 +02:00
Eelco Dolstra	af241ae7d3	Remove the builder-files option ... You can now include files via the "builders" option, using the syntax "@<filename>". Having only one option makes it easier to override builders completely. For backward compatibility, the default is "@/etc/nix/machines", or "@<filename>" for each file name in NIX_REMOTE_SYSTEMS.	2017-10-24 10:54:43 +02:00
Jörg Thalheim	2fd8f8bb99	Replace Unicode quotes in user-facing strings by ASCII ... Relevant RFC: NixOS/rfcs#4 $ ag -l | xargs sed -i -e "/\"/s/’/'/g;/\"/s/‘/'/g"	2017-07-30 12:32:45 +01:00
Eelco Dolstra	bb50c89319	Make the location of the build directory in the sandbox configurable ... This is mostly for use in the sandbox tests, since if the Nix store is under /build, then we can't use /build as the build directory.	2017-05-05 17:45:22 +02:00
Eelco Dolstra	7f6837a0f6	Replace $NIX_REMOTE_SYSTEMS with an option "builder-files" ... Also, to unify with hydra-queue-runner, allow it to be a list of files.	2017-05-02 15:46:09 +02:00
Eelco Dolstra	1a68710d4d	Add an option for specifying remote builders ... This is useful for one-off situations where you want to specify a builder on the command line instead of having to mess with nix.machines. E.g. $ nix-build -A hello --argstr system x86_64-darwin \ --option builders 'root@macstadium1 x86_64-darwin' will perform the specified build on "macstadium1". It also removes the need for a separate nix.machines file since you can specify builders in nix.conf directly. (In fact nix.machines is yet another hack that predates the general nix.conf configuration file, IIRC.) Note: this option is supported by the daemon for trusted users. The fact that this allows trusted users to specify paths to SSH keys to which they don't normally have access is maybe a bit too much trust...	2017-05-02 15:42:43 +02:00
Eelco Dolstra	ebc9f36a81	Factor out machines.conf parsing ... This allows hydra-queue-runner to use it.	2017-05-02 13:17:37 +02:00