Charles Strahan 
							
						 
					 
					
						
						
						
						
							
						
						
							4ed847d81d 
							
						 
					 
					
						
						
							
							redmine: fix use of bundler  
						
						 
						
						
						
						
					 
					
						2014-12-28 14:22:11 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charles Strahan 
							
						 
					 
					
						
						
						
						
							
						
						
							973794b24a 
							
						 
					 
					
						
						
							
							bundixify riemann-dash  
						
						 
						
						
						
						
					 
					
						2014-11-18 03:31:56 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charles Strahan 
							
						 
					 
					
						
						
						
						
							
						
						
							6e6ac35024 
							
						 
					 
					
						
						
							
							more rubyLibs renaming  
						
						 
						
						
						
						
					 
					
						2014-11-12 22:32:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							8636d93f54 
							
						 
					 
					
						
						
							
							Merge pull request  #4213  from wkennington/master.zfsiso  
						
						 
						
						... 
						
						
						
						[Dont Merge] nixos-iso: Add zfs / btrfs to supportedFilesystems 
						
						
					 
					
						2014-10-25 18:01:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aristid Breitkreuz 
							
						 
					 
					
						
						
						
						
							
						
						
							dabdab8dce 
							
						 
					 
					
						
						
							
							Merge pull request  #4640  from lethalman/installer-icons  
						
						 
						
						... 
						
						
						
						kde installer: Add gparted, nixos manual and konsole in the desktop 
						
						
					 
					
						2014-10-25 16:32:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luca Bruno 
							
						 
					 
					
						
						
						
						
							
						
						
							9e1ab43459 
							
						 
					 
					
						
						
							
							gnome3: Add cantarell fonts.  Closes   #4633  
						
						 
						
						
						
						
					 
					
						2014-10-24 11:50:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luca Bruno 
							
						 
					 
					
						
						
						
						
							
						
						
							e553e27f48 
							
						 
					 
					
						
						
							
							kde installer: Add gparted, nixos manual and konsole in the desktop  
						
						 
						
						
						
						
					 
					
						2014-10-23 18:59:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							3b133beb7a 
							
						 
					 
					
						
						
							
							Merge pull request  #4553  from ehmry/polipo  
						
						 
						
						... 
						
						
						
						drop permission prestart from polipo service module 
						
						
					 
					
						2014-10-23 12:51:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							5986bb2199 
							
						 
					 
					
						
						
							
							Merge pull request  #4631  from robberer/tmp1  
						
						 
						
						... 
						
						
						
						passwordFile: update description 
						
						
					 
					
						2014-10-23 11:36:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Longrin Wischnewski 
							
						 
					 
					
						
						
						
						
							
						
						
							a2c65d447f 
							
						 
					 
					
						
						
							
							passwordFile: update description  
						
						 
						
						
						
						
					 
					
						2014-10-23 04:52:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Tuegel 
							
						 
					 
					
						
						
						
						
							
						
						
							da77d9f409 
							
						 
					 
					
						
						
							
							Merge pull request  #4614  from geerds/kde4-plasma-nm  
						
						 
						
						... 
						
						
						
						kde4: Use plasma-nm instead of knetworkmanager 
						
						
					 
					
						2014-10-22 20:28:36 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aristid Breitkreuz 
							
						 
					 
					
						
						
						
						
							
						
						
							608aeede89 
							
						 
					 
					
						
						
							
							Merge pull request  #4597  from ehmry/cjdns  
						
						 
						
						... 
						
						
						
						Cjdns 
						
						
					 
					
						2014-10-22 20:49:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ricardo M. Correia 
							
						 
					 
					
						
						
						
						
							
						
						
							10348a0f2c 
							
						 
					 
					
						
						
							
							grsecurity: Update documentation to mention correct kernels  
						
						 
						
						
						
						
					 
					
						2014-10-22 16:50:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jascha Geerds 
							
						 
					 
					
						
						
						
						
							
						
						
							83ae3042a7 
							
						 
					 
					
						
						
							
							kde4: Use plasma-nm instead of knetworkmanager  
						
						 
						
						
						
						
					 
					
						2014-10-22 13:27:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								aszlig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							57aaf3d36e 
							
						 
					 
					
						
						
							
							Merge branch 'nixpart-1.0-preparations'.  
						
						 
						
						... 
						
						
						
						Partially and temporarily addresses NixOS/nixops#228 .
We now have an up-to-date version of Blivet and a bunch of its dependen-
cies as well as the old nixpart 0.4 with all its old and crappy
dependencies, which should fix _simple_ partitioning layouts for NixOps.
Also, nixpart 1.0 is now marked as broken, because it is not yet
released and this branch is more of a preparation and "damage control"
in case I shouldn't manage to finish nixpart + nixos-assimilate in time
for the next NixOS release. 
						
						
					 
					
						2014-10-22 08:23:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								aszlig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							23160383e3 
							
						 
					 
					
						
						
							
							nixos: Add a filesystem module for JFS.  
						
						 
						
						... 
						
						
						
						I'm not using JFS, but this is to mainly make jfsutils available if you
have defined a JFS filesystem in your configuration.
Signed-off-by: aszlig <aszlig@redmoonstudios.org> 
						
						
					 
					
						2014-10-22 08:22:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Emery Hemingway 
							
						 
					 
					
						
						
						
						
							
						
						
							a3338abcfe 
							
						 
					 
					
						
						
							
							cjdns: add peer hostnames to extraHosts, option for external config  
						
						 
						
						
						
						
					 
					
						2014-10-21 13:16:04 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Georges Dubus 
							
						 
					 
					
						
						
						
						
							
						
						
							50be0d5447 
							
						 
					 
					
						
						
							
							Removed the kde4_next nixos module  
						
						 
						
						... 
						
						
						
						Merged its differences into kde4. This commit fixes  #4519 . 
						
						
					 
					
						2014-10-21 14:04:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							14631cec82 
							
						 
					 
					
						
						
							
							nixos: prosody was clashing with seeks unix ids  
						
						 
						
						
						
						
					 
					
						2014-10-20 17:22:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaka Hudoklin 
							
						 
					 
					
						
						
						
						
							
						
						
							594f354bc7 
							
						 
					 
					
						
						
							
							nixos/graphite: fix grahite api documentation url  
						
						 
						
						
						
						
					 
					
						2014-10-20 13:32:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaka Hudoklin 
							
						 
					 
					
						
						
						
						
							
						
						
							09c8d909fb 
							
						 
					 
					
						
						
							
							nixos/graphite: update docs, add graphite pager  
						
						 
						
						
						
						
					 
					
						2014-10-20 13:27:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							a3b873924b 
							
						 
					 
					
						
						
							
							Let the kernel load firmware directly  
						
						 
						
						... 
						
						
						
						Loading firmware via udevd is obsolete. Fixes  #4552 . 
						
						
					 
					
						2014-10-20 13:25:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							f020a26164 
							
						 
					 
					
						
						
							
							nixos/systemd: Also escape \ characters  
						
						 
						
						
						
						
					 
					
						2014-10-19 16:34:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							2fa662c957 
							
						 
					 
					
						
						
							
							systemd: replace @ when generating unit command name  
						
						 
						
						
						
						
					 
					
						2014-10-19 17:20:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							0854836fd2 
							
						 
					 
					
						
						
							
							systemd: include name of the unit when generating nix store path  
						
						 
						
						
						
						
					 
					
						2014-10-19 15:49:55 +02: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaka Hudoklin 
							
						 
					 
					
						
						
						
						
							
						
						
							988ed87e70 
							
						 
					 
					
						
						
							
							nixos/neo4j: add package option  
						
						 
						
						
						
						
					 
					
						2014-10-18 13:18:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Emery Hemingway 
							
						 
					 
					
						
						
						
						
							
						
						
							32d6ae7ed9 
							
						 
					 
					
						
						
							
							drop permission prestart from polipo service module  
						
						 
						
						... 
						
						
						
						chowning the cache directory can timeout the service, permissions
on this directory should never change without user intervention 
						
						
					 
					
						2014-10-16 10:57:16 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rickard Nilsson 
							
						 
					 
					
						
						
						
						
							
						
						
							135d677690 
							
						 
					 
					
						
						
							
							nixos/logrotate: Fix spelling mistake  
						
						 
						
						
						
						
					 
					
						2014-10-16 08:20:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rickard Nilsson 
							
						 
					 
					
						
						
						
						
							
						
						
							cdba59d0f2 
							
						 
					 
					
						
						
							
							nixos/syslog-ng: Add option configHeader  
						
						 
						
						
						
						
					 
					
						2014-10-16 08:14:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rickard Nilsson 
							
						 
					 
					
						
						
						
						
							
						
						
							2ffe274486 
							
						 
					 
					
						
						
							
							nixos/logrotate: Specify type for config option  
						
						 
						
						
						
						
					 
					
						2014-10-15 16:52:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mathnerd314 
							
						 
					 
					
						
						
						
						
							
						
						
							938f92e8b2 
							
						 
					 
					
						
						
							
							Fix the driver for qemu ("vesa" -> "modesetting")  
						
						 
						
						... 
						
						
						
						Signed-off-by: Domen Kožar <domen@dev.si> 
						
						
					 
					
						2014-10-15 12:24:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							bc015be0f3 
							
						 
					 
					
						
						
							
							fix eval  
						
						 
						
						
						
						
					 
					
						2014-10-15 12:00:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lluís Batlle i Rossell 
							
						 
					 
					
						
						
						
						
							
						
						
							f594033822 
							
						 
					 
					
						
						
							
							nixos nfs: allow setting the lockd ports.  
						
						 
						
						... 
						
						
						
						This helps in setting a fixed firewall open port for NFS lockd.
Based on:
http://rlworkman.net/howtos/NFS_Firewall_HOWTO 
(cherry picked from commit b32ca0616ff70795f71995fa79ea508b82f30b3a)
Conflicts:
	nixos/modules/services/network-filesystems/nfsd.nix 
						
						
					 
					
						2014-10-15 10:59:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joachim Schiele 
							
						 
					 
					
						
						
						
						
							
						
						
							13298fcbb9 
							
						 
					 
					
						
						
							
							Merge pull request  #4535  from flosse/lua-bitop  
						
						 
						
						... 
						
						
						
						lua-packages: added lua-bitop to add websocket support for prosody 
						
						
					 
					
						2014-10-15 09:41:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							5118dcf4fb 
							
						 
					 
					
						
						
							
							nixos-iso: Add zfs / btrfs to supportedFilesystems  
						
						 
						
						
						
						
					 
					
						2014-10-14 20:24:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Markus Kohlhase 
							
						 
					 
					
						
						
						
						
							
						
						
							5308d3284b 
							
						 
					 
					
						
						
							
							prosody: added websocket support  
						
						 
						
						
						
						
					 
					
						2014-10-15 03:57:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rickard Nilsson 
							
						 
					 
					
						
						
						
						
							
						
						
							54a0ac090c 
							
						 
					 
					
						
						
							
							nixos/syslog-ng: Replace option serviceName with listenToJournal. Fix socket activation  
						
						 
						
						
						
						
					 
					
						2014-10-14 15:38:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							8523d0e44c 
							
						 
					 
					
						
						
							
							Dohh  
						
						 
						
						... 
						
						
						
						(cherry picked from commit b7451d91e8ecb70651fd2de81b2ec0faa8173aec) 
						
						
					 
					
						2014-10-14 11:43:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							028807c3a0 
							
						 
					 
					
						
						
							
							amazon-image.nix: Pass --option build-users-group '' to nix tools to make Amazon generation work with nix-1.8+  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 654eaeb2ca709908b0e6fdcc8eabd3af6b3c0a5d) 
						
						
					 
					
						2014-10-14 11:40:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mateusz Kowalczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c2fe5fd8 
							
						 
					 
					
						
						
							
							Merge pull request  #4400  from matejc/seeksservice  
						
						 
						
						... 
						
						
						
						seeks: update and write nixos module 
						
						
					 
					
						2014-10-13 21:37:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
						
						
							
						
						
							2ef0a17561 
							
						 
					 
					
						
						
							
							Merge pull request  #4387  from 1126/refactor-stumpwm  
						
						 
						
						... 
						
						
						
						stumpwm: update and refactoring 
						
						
					 
					
						2014-10-13 17:50:46 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matej Cotman 
							
						 
					 
					
						
						
						
						
							
						
						
							561d3b3860 
							
						 
					 
					
						
						
							
							seeks: nixos module  
						
						 
						
						
						
						
					 
					
						2014-10-13 13:10:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaka Hudoklin 
							
						 
					 
					
						
						
						
						
							
						
						
							dd0758ab6b 
							
						 
					 
					
						
						
							
							Merge pull request  #4392  from cstrahan/logstash  
						
						 
						
						... 
						
						
						
						logstash service improvements 
						
						
					 
					
						2014-10-12 23:02:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joachim Schiele 
							
						 
					 
					
						
						
						
						
							
						
						
							df95acd13c 
							
						 
					 
					
						
						
							
							Merge pull request  #3960  from flosse/prosody-service  
						
						 
						
						... 
						
						
						
						Prosody service 
						
						
					 
					
						2014-10-11 23:10:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Markus Kohlhase 
							
						 
					 
					
						
						
						
						
							
						
						
							d86c2c30c5 
							
						 
					 
					
						
						
							
							prosody: packaged as a service  
						
						 
						
						... 
						
						
						
						Conflicts:
	nixos/modules/misc/ids.nix 
						
						
					 
					
						2014-10-11 18:53:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							a5bed86fa4 
							
						 
					 
					
						
						
							
							zfs: zpool-import service must be wanted to start  
						
						 
						
						
						
						
					 
					
						2014-10-11 01:53:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							058bf4ccc4 
							
						 
					 
					
						
						
							
							Create a udev rule for /dev/root  
						
						 
						
						... 
						
						
						
						In the installation CD, this ensures that systemd will see a proper
udev node for /dev/root.
Fixes  #4399 .
Borrowed from
  http://lists.freedesktop.org/archives/systemd-devel/2014-July/020988.html  
						
						
					 
					
						2014-10-10 17:18:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							362699376a 
							
						 
					 
					
						
						
							
							nixos/network-interfaces: Bond interface configuration must wait for the bond device service  
						
						 
						
						... 
						
						
						
						Also fixes some formatting and removal of slave devices. 
						
						
					 
					
						2014-10-07 23:07:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							4941b96f0c 
							
						 
					 
					
						
						
							
							eval fix  
						
						 
						
						
						
						
					 
					
						2014-10-07 21:46:15 +02:00