Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							57f145a7f8 
							
						 
					 
					
						
						
							
							When setting $NIX_REMOTE, check whether /nix/var/nix/db is writable  
						
						 
						
						... 
						
						
						
						In NixOS containers, root doesn't have write permission to
/nix/var/nix/db, so it has to use the daemon. 
						
						
					 
					
						2013-11-27 17:09:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							2b1f212494 
							
						 
					 
					
						
						
							
							Disable various services when running inside a container  
						
						 
						
						
						
						
					 
					
						2013-11-26 18:19:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							408b8b5725 
							
						 
					 
					
						
						
							
							Add lots of missing option types  
						
						 
						
						
						
						
					 
					
						2013-10-30 18:47:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							0695b68c8c 
							
						 
					 
					
						
						
							
							Manual: Render multi-line strings properly  
						
						 
						
						
						
						
					 
					
						2013-10-29 17:39:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							259f7a93b1 
							
						 
					 
					
						
						
							
							Rename environment.nix -> nix.package  
						
						 
						
						
						
						
					 
					
						2013-10-28 22:45:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							d5047faede 
							
						 
					 
					
						
						
							
							Remove uses of the "merge" option attribute  
						
						 
						
						... 
						
						
						
						It's redundant because you can (and should) specify an option type, or
an apply function. 
						
						
					 
					
						2013-10-28 22:45:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							7cf0e0bda8 
							
						 
					 
					
						
						
							
							Manual: Fix bad \" characters  
						
						 
						
						
						
						
					 
					
						2013-10-28 22:45:56 +01: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