Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							b4cedc7965 
							
						 
					 
					
						
						
							
							nixos: reverse logic in nixos interactive tests documentation  
						
						
						
						
					 
					
						2014-11-27 20:01:18 +01:00 
						 
				 
			
				
					
						
							
							
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							91bdca38a0 
							
						 
					 
					
						
						
							
							NetworkManager.service -> network-manager.service  
						
						
						
						
					 
					
						2014-11-27 12:10:20 +01:00 
						 
				 
			
				
					
						
							
							
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							85daeeb222 
							
						 
					 
					
						
						
							
							Merge pull request  #4639  from lethalman/installer-nm  
						
						... 
						
						
						
						kde installer: enable networkmanager. Closes  #3433  
						
						
					 
					
						2014-11-21 22:29:10 +01:00 
						 
				 
			
				
					
						
							
							
								Luca Bruno 
							
						 
					 
					
						
						
						
						
							
						
						
							117f3359ac 
							
						 
					 
					
						
						
							
							nixos: document default GNOME 3.12 in the 14.11 release notes  
						
						
						
						
					 
					
						2014-11-18 01:02:43 +01:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							b89c06722f 
							
						 
					 
					
						
						
							
							options.json: Filter out "visible" and "internal" attributes  
						
						
						
						
					 
					
						2014-11-17 15:17:40 +01:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							44d14e2264 
							
						 
					 
					
						
						
							
							options.json: Export as an object rather than a list  
						
						... 
						
						
						
						This makes it easier to look up options by name. 
						
						
					 
					
						2014-11-17 15:17:39 +01:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							8b79cc00bf 
							
						 
					 
					
						
						
							
							Manual: Don't depend on the JSON options  
						
						
						
						
					 
					
						2014-11-17 15:17:39 +01:00 
						 
				 
			
				
					
						
							
							
								Rene Donner 
							
						 
					 
					
						
						
						
						
							
						
						
							8bd2f6bfc1 
							
						 
					 
					
						
						
							
							some typos  
						
						
						
						
					 
					
						2014-11-14 13:05:55 +01:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							b3eb981a95 
							
						 
					 
					
						
						
							
							apache-httpd: Make 2.4 the default  
						
						... 
						
						
						
						The NixOS 14.11 release is a good time to finally make 2.4 the
default. 
						
						
					 
					
						2014-11-06 14:55:44 +01:00 
						 
				 
			
				
					
						
							
							
								Luca Bruno 
							
						 
					 
					
						
						
						
						
							
						
						
							7dbf4d73c7 
							
						 
					 
					
						
						
							
							docs: hint to stop NetworkManager during installation to manually configure the network  
						
						
						
						
					 
					
						2014-11-02 23:42:17 +01:00 
						 
				 
			
				
					
						
							
							
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							5858ac57a8 
							
						 
					 
					
						
						
							
							next release will be 14.11  
						
						
						
						
					 
					
						2014-10-22 15:41:30 +02:00 
						 
				 
			
				
					
						
							
							
								Mateusz Kowalczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1ffe41b34f 
							
						 
					 
					
						
						
							
							Merge branch 'dev/ati-drivers' of  https://github.com/nathanielbaxter/nixpkgs  
						
						
						
						
					 
					
						2014-09-22 01:27:00 +01:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							32fa5ee2c5 
							
						 
					 
					
						
						
							
							Manual: Fix build product  
						
						
						
						
					 
					
						2014-09-10 15:03:59 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Fellinger 
							
						 
					 
					
						
						
						
						
							
						
						
							33aaa7ac54 
							
						 
					 
					
						
						
							
							fix location of options.xml  
						
						
						
						
					 
					
						2014-09-09 13:43:23 +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 
						 
				 
			
				
					
						
							
							
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							a4e60ebacf 
							
						 
					 
					
						
						
							
							Merge pull request  #3811  from nbp/options-json  
						
						... 
						
						
						
						Export the list of options to XML & JSON, such that external tools can use it. 
						
						
					 
					
						2014-09-07 10:39:03 -07:00 
						 
				 
			
				
					
						
							
							
								Nicolas Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							79411db08b 
							
						 
					 
					
						
						
							
							Export options.json & options.xml for building tools for NixOS.  
						
						
						
						
					 
					
						2014-09-07 18:39:24 +02:00 
						 
				 
			
				
					
						
							
							
								Nathaniel Baxter 
							
						 
					 
					
						
						
						
						
							
						
						
							5856fbc7d2 
							
						 
					 
					
						
						
							
							nixos-manual: Fix reference to obsolete configuration option  
						
						
						
						
					 
					
						2014-09-07 11:58:06 +02:00 
						 
				 
			
				
					
						
							
							
								Nathaniel Baxter 
							
						 
					 
					
						
						
						
						
							
						
						
							fb9a6221b6 
							
						 
					 
					
						
						
							
							ati_unfree: Update nixos-manual for AMD driver support  
						
						
						
						
					 
					
						2014-09-07 12:42:32 +10: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							3d037ebb94 
							
						 
					 
					
						
						
							
							Revert "Revert "Merge pull request  #3182  from wkennington/master.ipv6""  
						
						... 
						
						
						
						This reverts commit ea8910652fcecbcd4f21aa1c66b1a0a239408b04. 
						
						
					 
					
						2014-08-31 09:46:16 -07:00 
						 
				 
			
				
					
						
							
							
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							ea8910652f 
							
						 
					 
					
						
						
							
							Revert "Merge pull request  #3182  from wkennington/master.ipv6"  
						
						... 
						
						
						
						This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing
changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6. 
						
						
					 
					
						2014-08-31 10:58:54 +02:00 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							86c0f8c549 
							
						 
					 
					
						
						
							
							Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes  
						
						
						
						
					 
					
						2014-08-30 07:33:38 -07: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 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							41788255ab 
							
						 
					 
					
						
						
							
							Manual: Start of module-specific documentation  
						
						
						
						
					 
					
						2014-08-27 12:24:44 +02:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							60e6cc81b5 
							
						 
					 
					
						
						
							
							No caps in filenames  
						
						
						
						
					 
					
						2014-08-26 19:04:02 +02:00 
						 
				 
			
				
					
						
							
							
								Mikey Ariel 
							
						 
					 
					
						
						
						
						
							
						
						
							a099ca4505 
							
						 
					 
					
						
						
							
							Chunk NixOS manual  
						
						... 
						
						
						
						[Squashed commits to make git blame etc. more likely to work. -ED] 
						
						
					 
					
						2014-08-26 19:03:49 +02:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							c72fdf4f48 
							
						 
					 
					
						
						
							
							Manual: Tweak  
						
						
						
						
					 
					
						2014-08-26 15:13:21 +02:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							81f2749012 
							
						 
					 
					
						
						
							
							Manual: Chunk into separate pages  
						
						
						
						
					 
					
						2014-08-25 19:08:31 +02:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							b1ce3cc172 
							
						 
					 
					
						
						
							
							Manual: Handle XML files in subdirectories  
						
						
						
						
					 
					
						2014-08-25 14:33:33 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Raskin 
							
						 
					 
					
						
						
						
						
							
						
						
							327074682f 
							
						 
					 
					
						
						
							
							Merge pull request  #3522  from ryantm/patch-1  
						
						... 
						
						
						
						add note about mutableUsers to user management section 
						
						
					 
					
						2014-08-23 12:47:42 +04: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 
						 
				 
			
				
					
						
							
							
								Nathaniel Baxter 
							
						 
					 
					
						
						
						
						
							
						
						
							7d4cd20ea4 
							
						 
					 
					
						
						
							
							nixos manual: Fix instruction for getting booted kernel confix  
						
						
						
						
					 
					
						2014-08-17 16:10:10 +10: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 
							
						 
					 
					
						
						
						
						
							
						
						
							1a75958be5 
							
						 
					 
					
						
						
							
							Unify mutableUsers = { true, false }  
						
						... 
						
						
						
						With mutableUsers = true, we now ensure that all users and groups that
were created declaratively, are updated or removed
appropriately. Thus, adding a user to users.extraUsers and then
removing it now causes the acoount to be removed from
/etc/passwd. Thus user/group management is fully congruent except that
users and groups that were created imperatively (via useradd/groupadd)
are not touched. We distinguish between declarative and imperative
users/groups by tracking the former in
/var/lib/nixos/declarative-{groups,users}.
With mutableUsers = false, you are now no longer required to specify
UIDs/GIDs for all users. The handling of mutableUsers = true/false is
the same code path; the only difference is that the "false" mode
ignores the existing contents of /etc/{passwd,group}.
The attribute ‘createUser’ is gone. It doesn't really make sense to
specify users that shouldn't be created. 
						
						
					 
					
						2014-08-15 02:15:29 +02:00 
						 
				 
			
				
					
						
							
							
								Ryan Mulligan 
							
						 
					 
					
						
						
						
						
							
						
						
							fee04927a4 
							
						 
					 
					
						
						
							
							add note about mutableUsers to user management section  
						
						
						
						
					 
					
						2014-08-10 08:39:31 -07:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							7a09c6018d 
							
						 
					 
					
						
						
							
							Manual: Generate PDF  
						
						... 
						
						
						
						Issue NixOS/nixos#237 . 
						
						
					 
					
						2014-08-09 16:33:12 +02:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							aeb5c14eb9 
							
						 
					 
					
						
						
							
							Manual: Remove outdated author stuff  
						
						
						
						
					 
					
						2014-08-09 16:33:01 +02:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							80a3c883a9 
							
						 
					 
					
						
						
							
							Manual: Render function defaults  
						
						
						
						
					 
					
						2014-08-09 16:33:01 +02:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							2d326e5032 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into staging.  
						
						... 
						
						
						
						Conflicts:
	pkgs/desktops/e18/enlightenment.nix 
						
						
					 
					
						2014-08-04 16:51:47 +02:00 
						 
				 
			
				
					
						
							
							
								Damien Cassou 
							
						 
					 
					
						
						
						
						
							
						
						
							355a46ec5d 
							
						 
					 
					
						
						
							
							Make the networkmanager group more discoverable  
						
						... 
						
						
						
						This change makes the manual present the networkmanager group at several
places to make sure new users see it. 
						
						
					 
					
						2014-07-29 09:14:57 +02:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							f64d84698e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into staging  
						
						... 
						
						
						
						Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix 
						
						
					 
					
						2014-07-28 11:30:49 +02:00 
						 
				 
			
				
					
						
							
							
								aszlig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							15bb4c20e6 
							
						 
					 
					
						
						
							
							nixos/doc/manual: Fix typos in README.  
						
						... 
						
						
						
						Signed-off-by: aszlig <aszlig@redmoonstudios.org> 
						
						
					 
					
						2014-07-23 15:00:25 +02:00 
						 
				 
			
				
					
						
							
							
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							4cac67cada 
							
						 
					 
					
						
						
							
							Merge pull request  #3335  from DamienCassou/doc-for-building-the-nixos-manual  
						
						... 
						
						
						
						README for building the nixos manual 
						
						
					 
					
						2014-07-23 09:48:09 +02:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							7f410ef923 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into staging  
						
						... 
						
						
						
						Conflicts:
	pkgs/misc/vim-plugins/default.nix 
						
						
					 
					
						2014-07-22 11:00:00 +02:00 
						 
				 
			
				
					
						
							
							
								Damien Cassou 
							
						 
					 
					
						
						
						
						
							
						
						
							812da7cd2f 
							
						 
					 
					
						
						
							
							Adding a missing instruction for EFI installations  
						
						... 
						
						
						
						This commit also adds a link to rEFInd which is a useful tool to manage
EFI systems. If this link is not desired, I can remove it. 
						
						
					 
					
						2014-07-21 17:54:38 +02:00 
						 
				 
			
				
					
						
							
							
								Damien Cassou 
							
						 
					 
					
						
						
						
						
							
						
						
							c59dc1ddc0 
							
						 
					 
					
						
						
							
							README for building the nixos manual  
						
						
						
						
					 
					
						2014-07-21 17:24:10 +02:00