Robin Gloster
							
						 
					 | 
					
						
						
						
						
							
						
						
							246f0e91cd
							
						
					 | 
					
						
						
							
							wpa_supplicant service: Warn about plaintext keys in docs
						
						
						
						
						
						
					 | 
					
						2016-01-06 03:58:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robin Gloster
							
						 
					 | 
					
						
						
						
						
							
						
						
							d03b35f881
							
						
					 | 
					
						
						
							
							wpa_supplicant module: add networks option
						
						
						
						
						
						
					 | 
					
						2016-01-06 03:58:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Peter Simons
							
						 
					 | 
					
						
						
						
						
							
						
						
							49d18bdfcb
							
						
					 | 
					
						
						
							
							Revert "Basic Declaritive Network Configuration in wpa_supplicant Service"
						
						
						
						
						
						
					 | 
					
						2016-01-05 19:32:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robin Gloster
							
						 
					 | 
					
						
						
						
						
							
						
						
							56a53ff458
							
						
					 | 
					
						
						
							
							wpa_supplicant module: add networks option
						
						
						
						
						
						
					 | 
					
						2015-12-29 18:49:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Franz Pletz
							
						 
					 | 
					
						
						
						
						
							
						
						
							1685b9d06e
							
						
					 | 
					
						
						
							
							nixos/acme: Add module documentation
						
						
						
						
						
						
					 | 
					
						2015-12-12 16:06:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nicolas B. Pierron
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5992ad61b
							
						
					 | 
					
						
						
							
							Add a way to pin a NixOS version within the module system.
						
						
						
						
						
						
						
						This modification add a way to re-evaluate the module system with a
different version of NixOS, or with a different set of arguments. 
						
						
					 | 
					
						2015-11-19 20:58:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bjørn Forsman
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd84ebaa1e
							
						
					 | 
					
						
						
							
							nixos: document nvidia legacy driver options
						
						
						
						
						
						
					 | 
					
						2015-09-02 13:25:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eelco Dolstra
							
						 
					 | 
					
						
						
						
						
							
						
						
							2cd7c1f198
							
						
					 | 
					
						
						
							
							Unify NixOS and Nixpkgs channel structure
						
						
						
						
						
						
						
						This is primarily to ensure that
  -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz
and
  -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz
and
  -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz
behave consistently.
It also allows installing packages via "nix-env -iA nixos.<pkg>"
rather than "nixos.pkgs.<pkg>". It would be even better to allow
"nixpkgs.<pkg>", but that requires a change to nix-channel.
Fixes #7659. 
						
						
					 | 
					
						2015-08-05 17:37:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladimír Čunát
							
						 
					 | 
					
						
						
						
						
							
						
						
							dfaded0b8e
							
						
					 | 
					
						
						
							
							nixos docs: fix typo
						
						
						
						
						
						
					 | 
					
						2015-03-07 14:44:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikita Mikhailov
							
						 
					 | 
					
						
						
						
						
							
						
						
							25e29b3870
							
						
					 | 
					
						
						
							
							Correct NetworkManager documentation
						
						
						
						
						
						
					 | 
					
						2015-02-24 22:09:36 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Khalid Jebbari
							
						 
					 | 
					
						
						
						
						
							
						
						
							b385d14b81
							
						
					 | 
					
						
						
							
							Fix typo in recursive set example
						
						
						
						
						
						
					 | 
					
						2015-01-04 19:28:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Domen Kožar
							
						 
					 | 
					
						
						
						
						
							
						
						
							91bdca38a0
							
						
					 | 
					
						
						
							
							NetworkManager.service -> network-manager.service
						
						
						
						
						
						
					 | 
					
						2014-11-27 12:10:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rene Donner
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bd2f6bfc1
							
						
					 | 
					
						
						
							
							some typos
						
						
						
						
						
						
					 | 
					
						2014-11-14 13:05:55 +01: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							585983bc95
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/staging'
						
						
						
						
						
						
						
						Conflicts:
	pkgs/applications/version-management/subversion/default.nix 
						
						
					 | 
					
						2014-09-08 11:42:09 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 |