54 Commits

Author	SHA1	Message	Date
Shea Levy	a5a13c4e43	Add gurobi token server service ... Not yet tested, I don't have a license yet Signed-off-by: Shea Levy <shea@shealevy.com>	2013-10-16 11:02:05 -04:00
Eelco Dolstra	e0db0aaa4d	Rename /etc/nix.machines to /etc/nix/machines ... Since we have a /etc/nix directory, we should use it and not pollute /etc.	2013-10-16 10:57:25 +02:00
Eelco Dolstra	16cd8b039b	Remove nix.manualNixMachines ... Suggested by Marc Weber. Fixes #1059. Generate /etc/nix.machines only if buildMachines is not empty. Thus, if you want to manage /etc/nix.machines in some other way, you can set nix.distributedBuilds to true but not set nix.buildMachines.	2013-10-16 10:53:23 +02:00
Eelco Dolstra	5c1f8cbc70	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00