Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c4569b6b 
							
						 
					 
					
						
						
							
							nixos-install: Create /root with 700 permission  
						
						 
						
						
						
						
					 
					
						2015-01-15 18:37:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							a4961f09f6 
							
						 
					 
					
						
						
							
							Merge pull request  #5390  from abbradar/nixos-isntall  
						
						 
						
						... 
						
						
						
						nixos-install: fix -I flag 
						
						
					 
					
						2014-12-23 18:15:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							6a7971bee7 
							
						 
					 
					
						
						
							
							Merge pull request  #5416  from nbp/nixos-option-include  
						
						 
						
						... 
						
						
						
						nixos-option: Support -I option 
						
						
					 
					
						2014-12-21 15:11:11 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							974edc5056 
							
						 
					 
					
						
						
							
							nixos-option: Use <nixpkgs/nixos> instead of <nixpkgs>.  
						
						 
						
						
						
						
					 
					
						2014-12-21 01:33:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							82a5f54c0d 
							
						 
					 
					
						
						
							
							nixos-option: Support -I option.  
						
						 
						
						
						
						
					 
					
						2014-12-20 20:30:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							c9682a22ff 
							
						 
					 
					
						
						
							
							nixos-option: Produce nicer error messages in case of typos.  
						
						 
						
						
						
						
					 
					
						2014-12-20 19:52:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							640428d3c5 
							
						 
					 
					
						
						
							
							nixos-option: Handle 'attrsOf submodule' options.  
						
						 
						
						
						
						
					 
					
						2014-12-20 19:16:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							cd2f7ce9f9 
							
						 
					 
					
						
						
							
							nixos-option: Improve error messages to avoid reporting internal location and traces.  
						
						 
						
						
						
						
					 
					
						2014-12-19 23:00:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							b2abfe54b3 
							
						 
					 
					
						
						
							
							nixos-option: Print derivation outPath within attribute sets and list, when the strict mode is used.  
						
						 
						
						
						
						
					 
					
						2014-12-19 23:00:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							9db6a84f0b 
							
						 
					 
					
						
						
							
							nixos-option: Print the outPath of derivation for option values.  
						
						 
						
						
						
						
					 
					
						2014-12-19 22:33:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolay Amiantov 
							
						 
					 
					
						
						
						
						
							
						
						
							22eb0e22d3 
							
						 
					 
					
						
						
							
							nixos-install: fix -I flag  
						
						 
						
						
						
						
					 
					
						2014-12-18 22:43:40 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							432490e319 
							
						 
					 
					
						
						
							
							fix users.mutableUsers = false; install in iso  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 9bc8bcbbdcc7cac98686877f09315bb749627732)
Signed-off-by: Domen Kožar <domen@dev.si> 
						
						
					 
					
						2014-12-18 12:18:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							bed675f400 
							
						 
					 
					
						
						
							
							nixos-generate-config: Don't emit networking.hostId  
						
						 
						
						... 
						
						
						
						Systemd already generates /etc/machine-id. So there is no need to
generate another unique host identifer. 
						
						
					 
					
						2014-12-15 17:03:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							0d3a229baa 
							
						 
					 
					
						
						
							
							nixos-generate-config: Add time zone  
						
						 
						
						
						
						
					 
					
						2014-12-15 16:55:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								aszlig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cf7f15c92c 
							
						 
					 
					
						
						
							
							nixos-install: Pass CA cert bundle to chroot.  
						
						 
						
						... 
						
						
						
						Since we're using HTTPS for the binary cache (introduced in faf0797) by
default, the binary cache should also be available during installation.
The file that is defined in SSL_CERT_FILE outside of the chroot is
copied over to /tmp/ca-cert.crt inside the chroot, so we have an
absolute path we can reference during nixos-install. However, this might
end up with the file not being cleaned up properly from outside of the
store, but neither would be /tmp/root so the cleanup issue needs to be
solved in another place (or commit to be more exact).
Signed-off-by: aszlig <aszlig@redmoonstudios.org> 
						
						
					 
					
						2014-12-12 03:03:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							faf0797c0c 
							
						 
					 
					
						
						
							
							Use  https://cache.nixos.org  
						
						 
						
						
						
						
					 
					
						2014-12-09 13:38:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								aszlig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							444987193e 
							
						 
					 
					
						
						
							
							nixos: Rename virtualbox to virtualboxGuest.  
						
						 
						
						... 
						
						
						
						Especially new users could be confused by this, so we're now marking
services.virtualbox.enable as obsolete and defaulting to
services.virtualboxGuest.enable instead. I believe this now makes it
clear, that this option is for guest additions only.
Signed-off-by: aszlig <aszlig@redmoonstudios.org> 
						
						
					 
					
						2014-11-27 18:42:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bjørn Forsman 
							
						 
					 
					
						
						
						
						
							
						
						
							8835d932b1 
							
						 
					 
					
						
						
							
							nixos-generate-config: add 'lib' to module template  
						
						 
						
						... 
						
						
						
						The NixOS manual says modules have the following signature:
 { config, lib, pkgs, ... }:
But our generated configuration.nix file lacks the 'lib' part. Add it. 
						
						
					 
					
						2014-11-17 17:13:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ricardo M. Correia 
							
						 
					 
					
						
						
						
						
							
						
						
							7a7bf8368e 
							
						 
					 
					
						
						
							
							nixos-generate-config: Configure networking.hostId by default  
						
						 
						
						... 
						
						
						
						The host id value gets generated by reading a 32-bit value from
/dev/urandom.
This makes programs that rely on a correct host id more reliable.
It also makes using ZFS more seamless, as you don't need to configure
the hostId manually; instead, it becomes part of your config from the
moment you install NixOS. 
						
						
					 
					
						2014-11-12 22:31:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aristid Breitkreuz 
							
						 
					 
					
						
						
						
						
							
						
						
							bda39ae4de 
							
						 
					 
					
						
						
							
							remove unused parameter from nixos module that is causing trouble with nixops 1.2  
						
						 
						
						
						
						
					 
					
						2014-10-19 14:10:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							05163e99db 
							
						 
					 
					
						
						
							
							nixos-rebuild: Don't pass -K by default  
						
						 
						
						
						
						
					 
					
						2014-09-10 14:57:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							1a9c27c092 
							
						 
					 
					
						
						
							
							Typo  
						
						 
						
						
						
						
					 
					
						2014-09-08 13:58:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							585983bc95 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/staging'  
						
						 
						
						... 
						
						
						
						Conflicts:
	pkgs/applications/version-management/subversion/default.nix 
						
						
					 
					
						2014-09-08 11:42:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							18d9904433 
							
						 
					 
					
						
						
							
							nixos-option: fixes as suggested by @nbp  
						
						 
						
						
						
						
					 
					
						2014-09-06 20:59:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							06fea81c6e 
							
						 
					 
					
						
						
							
							Merge recent master into staging  
						
						 
						
						... 
						
						
						
						Hydra: ?compare=1150594 
						
						
					 
					
						2014-09-06 16:52:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luca Bruno 
							
						 
					 
					
						
						
						
						
							
						
						
							a1ded5c20e 
							
						 
					 
					
						
						
							
							nixos-install: use absolute path when running passwd in chroot  
						
						 
						
						
						
						
					 
					
						2014-09-03 23:12:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luca Bruno 
							
						 
					 
					
						
						
						
						
							
						
						
							59ad713288 
							
						 
					 
					
						
						
							
							nixos-install: set umask 0022  
						
						 
						
						
						
						
					 
					
						2014-09-03 23:12:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							2e97c06999 
							
						 
					 
					
						
						
							
							nixos-option: enable all flags by default and make output a bit readable cc @nbp  
						
						 
						
						
						
						
					 
					
						2014-09-03 22:08:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							87b6232f3a 
							
						 
					 
					
						
						
							
							nixos/generate-config: Don't interpret btrfs subvols as bind mounts  
						
						 
						
						
						
						
					 
					
						2014-09-02 09:16:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							7fae423522 
							
						 
					 
					
						
						
							
							nixos/generate-config: Support detecting nested subvolumes  
						
						 
						
						
						
						
					 
					
						2014-09-02 09:16:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							36614ff3e2 
							
						 
					 
					
						
						
							
							Revert "Revert "Merge pull request  #2449  from wkennington/master.grub""  
						
						 
						
						... 
						
						
						
						This reverts commit 94205f5f21c4d9942bb4205c06229438051b6853.
Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl 
						
						
					 
					
						2014-09-02 09:16:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							1c0d15b90e 
							
						 
					 
					
						
						
							
							Merge branch 'origin/master' into staging.  
						
						 
						
						... 
						
						
						
						Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix 
						
						
					 
					
						2014-09-02 12:31:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
						
						
							
						
						
							94205f5f21 
							
						 
					 
					
						
						
							
							Revert "Merge pull request  #2449  from wkennington/master.grub"  
						
						 
						
						... 
						
						
						
						This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing
changes made to 0078bc5d8f87512104902eab00c8a44bef286067.
Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix
I tried to keep apparently-safe code in conflicts. 
						
						
					 
					
						2014-08-31 12:58:37 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							e51f73652d 
							
						 
					 
					
						
						
							
							Merge recent master into staging  
						
						 
						
						... 
						
						
						
						Hydra: ?compare=1149952
Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved) 
						
						
					 
					
						2014-08-30 10:04:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							4428178847 
							
						 
					 
					
						
						
							
							nixos/generate-config: Fix indentation  
						
						 
						
						
						
						
					 
					
						2014-08-29 12:19:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							36a47733a2 
							
						 
					 
					
						
						
							
							nixos-generate-config: Detect btrfs subvolumes  
						
						 
						
						
						
						
					 
					
						2014-08-28 13:35:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaka Kranjc 
							
						 
					 
					
						
						
						
						
							
						
						
							1d67ea1ce3 
							
						 
					 
					
						
						
							
							nixos-install.sh: added --root parameter  
						
						 
						
						... 
						
						
						
						Previously:
- setting the mountpoint was only possible through an environment variable
- a discrepancy from nixos-generate-config, which has --root 
						
						
					 
					
						2014-08-24 17:40:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							d4e9fd2a90 
							
						 
					 
					
						
						
							
							Merge recent master into staging  
						
						 
						
						... 
						
						
						
						Hydra: ?compare=1148749
Conflicts (easy):
	nixos/modules/virtualisation/containers.nix 
						
						
					 
					
						2014-08-21 15:09:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								aszlig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6ebe4a6a52 
							
						 
					 
					
						
						
							
							nixos-install: Fix copying symlink resolv.conf.  
						
						 
						
						... 
						
						
						
						On some non-NixOS systems (for example those using "resolvconf"),
/etc/resolv.conf is a symlink. So let's dereference when copying hasts
and resolv.conf.
Signed-off-by: aszlig <aszlig@redmoonstudios.org> 
						
						
					 
					
						2014-08-17 06:46:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							a323d146b7 
							
						 
					 
					
						
						
							
							Add user attribute isNormalUser  
						
						 
						
						... 
						
						
						
						This is shorthand for setting group, createHome, home, useDefaultShell
and isSystemUser. 
						
						
					 
					
						2014-08-15 02:16:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							785ed2b528 
							
						 
					 
					
						
						
							
							Don't silently ignore errors from the activation script  
						
						 
						
						
						
						
					 
					
						2014-08-15 02:14:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							b3cfb9084b 
							
						 
					 
					
						
						
							
							Get all lib functions from lib, not pkgs.lib, in modules  
						
						 
						
						
						
						
					 
					
						2014-07-02 12:28:18 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
						
						
							
						
						
							77314b7eb2 
							
						 
					 
					
						
						
							
							Merge pull request  #2888  from nilcons/no-random-arch-downgrades  
						
						 
						
						... 
						
						
						
						Fix nixos-rebuild.sh to depend on Nix 
						
						
					 
					
						2014-06-30 12:47:17 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bjørn Forsman 
							
						 
					 
					
						
						
						
						
							
						
						
							aff4394be6 
							
						 
					 
					
						
						
							
							nixos-generate-config: fix nix-env example command  
						
						 
						
						... 
						
						
						
						An escape char is needed to prevent "$ nix" from being evaluated and
expanded to an empty string. With this change the resulting text is
  $ nix-env -qaP | grep wget
instead of
  -env -qaP | grep wget 
						
						
					 
					
						2014-06-12 21:18:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gergely Risko 
							
						 
					 
					
						
						
						
						
							
						
						
							068c7fd037 
							
						 
					 
					
						
						
							
							Fix nixos-rebuild.sh to depend on Nix  
						
						 
						
						... 
						
						
						
						And therefore always choose the correct architecture for the rebuilt
system regardless for the PATH setting of the user. 
						
						
					 
					
						2014-06-10 20:13:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sander van der Burg 
							
						 
					 
					
						
						
						
						
							
						
						
							33d99a22ca 
							
						 
					 
					
						
						
							
							nixos-build-vms: Fix function invocation to test driver  
						
						 
						
						
						
						
					 
					
						2014-06-09 13:36:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							1e2291f23a 
							
						 
					 
					
						
						
							
							nixos-install: Fix running it after again the activation script  
						
						 
						
						
						
						
					 
					
						2014-05-21 15:55:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							e135e6b35b 
							
						 
					 
					
						
						
							
							nixos-install: Copy /etc/hosts  
						
						 
						
						... 
						
						
						
						http://hydra.nixos.org/build/11130069  
						
						
					 
					
						2014-05-21 11:20:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							1c4fd9b25d 
							
						 
					 
					
						
						
							
							nixos-install: Run in a separate UTS namespace  
						
						 
						
						... 
						
						
						
						This prevents the activation script from clobbering our hostname. 
						
						
					 
					
						2014-05-09 13:25:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							61bdad6775 
							
						 
					 
					
						
						
							
							nixos-install: Don't bind-mount all of /etc  
						
						 
						
						... 
						
						
						
						We only need a copy of /etc/resolv.conf for networking, and
/etc/{passwd,group} for building. 
						
						
					 
					
						2014-05-09 00:52:02 +02:00