Charles Strahan 
							
						 
					 
					
						
						
						
						
							
						
						
							dfc225d143 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby  
						
						... 
						
						
						
						Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix 
						
						
					 
					
						2015-01-20 20:21:03 -05:00 
						 
				 
			
				
					
						
							
							
								Joachim Fasting 
							
						 
					 
					
						
						
						
						
							
						
						
							7023e03d77 
							
						 
					 
					
						
						
							
							firewall service: fix pingLimit example value  
						
						... 
						
						
						
						The example uses single dashes, whereas iptables requires double dashes. 
						
						
					 
					
						2015-01-20 08:47:11 +01:00 
						 
				 
			
				
					
						
							
							
								Andrey Arapov 
							
						 
					 
					
						
						
						
						
							
						
						
							04be7262a6 
							
						 
					 
					
						
						
							
							nixos/dovecot: added configFile option and default Restart on-failure, PR  #5845  
						
						... 
						
						
						
						Absolute path is required when one has such postfix configuration
where he/she needs to specify the actual (real) path to active dovecot
config.
Without this commit applied, the dovecot is running in such way:
/nix/store/hashAAA-dovecot-ver/sbin/dovecot -F -c /nix/store/hashBBB-dovecot2.conf
and postfix can't be aware of the value of "hashBBB" via services.postfix.extraConfig = '' ... '';
(it can only be aware of "hashAAA" with ${pkgs.dovecot} parameter)
Also enable Restart on-failure.
Edit: set RestartSec to 1s 
						
						
					 
					
						2015-01-19 11:05:56 +01:00 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							130f66b683 
							
						 
					 
					
						
						
							
							nixos/sync-server: Respect the enable option  
						
						
						
						
					 
					
						2015-01-18 14:21:40 -08:00 
						 
				 
			
				
					
						
							
							
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							3b174a4024 
							
						 
					 
					
						
						
							
							Merge pull request  #5301  from nbp/syncserver  
						
						... 
						
						
						
						Add Firefox Sync service 
						
						
					 
					
						2015-01-18 17:47:51 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							8196727fad 
							
						 
					 
					
						
						
							
							Improve the documentation of the syncserver module.  
						
						
						
						
					 
					
						2015-01-18 12:21:23 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas B. Pierron 
							
						 
					 
					
						
						
						
						
							
						
						
							0d13ea0131 
							
						 
					 
					
						
						
							
							Change default syncserver listen.port to a safer one.  
						
						
						
						
					 
					
						2015-01-18 12:20:44 +01:00 
						 
				 
			
				
					
						
							
							
								Damien Cassou 
							
						 
					 
					
						
						
						
						
							
						
						
							a7024cb4b4 
							
						 
					 
					
						
						
							
							Create a nixos module for cups-browsed  
						
						
						
						
					 
					
						2015-01-16 14:10:57 +01:00 
						 
				 
			
				
					
						
							
							
								Edward Tjörnhammar 
							
						 
					 
					
						
						
						
						
							
						
						
							837cfbb9ea 
							
						 
					 
					
						
						
							
							nixos: adding nylon service with uid,gid  
						
						
						
						
					 
					
						2015-01-14 22:08:47 +01:00 
						 
				 
			
				
					
						
							
							
								Matej Cotman 
							
						 
					 
					
						
						
						
						
							
						
						
							4e6efec4b4 
							
						 
					 
					
						
						
							
							enlightenment: fix media preview  
						
						
						
						
					 
					
						2015-01-13 14:56:35 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							72d2d59cd4 
							
						 
					 
					
						
						
							
							/etc/ssh/ssh_known_hosts: refactor and  fix   #5612  
						
						... 
						
						
						
						Generating the file was refactored to be completely in nix.
Functionally it should create the same content as before,
only adding the newlines.
CC recent updaters: @aszlig, @rickynils. 
						
						
					 
					
						2015-01-11 22:14:25 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							43bae26b33 
							
						 
					 
					
						
						
							
							Merge pull request  #5627  from oxij/update-postfix  
						
						... 
						
						
						
						postfix: make 2.11 the default, nixos: update postfix config for 2.11 
						
						
					 
					
						2015-01-11 11:28:31 +01:00 
						 
				 
			
				
					
						
							
							
								lethalman 
							
						 
					 
					
						
						
						
						
							
						
						
							908c47b281 
							
						 
					 
					
						
						
							
							Merge pull request  #5550  from abbradar/fprintd  
						
						... 
						
						
						
						add fprintd support 
						
						
					 
					
						2015-01-08 14:58:22 +01:00 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							dd7efcbf36 
							
						 
					 
					
						
						
							
							java: More default cleanups  
						
						
						
						
					 
					
						2015-01-07 14:55:41 -08:00 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							c82410eeda 
							
						 
					 
					
						
						
							
							java: Normalize to the default jre / jdk  
						
						
						
						
					 
					
						2015-01-07 14:55:41 -08:00 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							9a7766e054 
							
						 
					 
					
						
						
							
							nixos/network-interfaces: Add mstpd support for bridges  
						
						
						
						
					 
					
						2015-01-07 14:49:24 -08:00 
						 
				 
			
				
					
						
							
							
								Jan Malakhovski 
							
						 
					 
					
						
						
						
						
							
						
						
							265c1c1472 
							
						 
					 
					
						
						
							
							postfix: make 2.11 the default, nixos: update postfix config for 2.11  
						
						... 
						
						
						
						postfix 2.11 is much more humane with respect to disk writes since it uses
sockets (which do not change inodes on accesses) instead of fifos (which do). 
						
						
					 
					
						2015-01-07 15:43:32 +00:00 
						 
				 
			
				
					
						
							
							
								j-keck 
							
						 
					 
					
						
						
						
						
							
						
						
							3ced0d94ac 
							
						 
					 
					
						
						
							
							doc: use postgresql94  
						
						... 
						
						
						
						update postgresql module doc to use postgresql94 (was postgresql93) 
						
						
					 
					
						2015-01-07 13:21:18 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							ea94a6d653 
							
						 
					 
					
						
						
							
							nixos/modules/services/misc/nix-daemon.nix: document meaning of '0' for the buildCores attribute  
						
						
						
						
					 
					
						2015-01-05 15:38:08 +01:00 
						 
				 
			
				
					
						
							
							
								Rob Vermaas 
							
						 
					 
					
						
						
						
						
							
						
						
							c5caa853ec 
							
						 
					 
					
						
						
							
							dd-agent: set SSL_CERT_FILE for dogstatsd.  
						
						... 
						
						
						
						(cherry picked from commit c67204dec27a86e2235afb2aebf48bc53dd804d0) 
						
						
					 
					
						2015-01-05 13:15:22 +01:00 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							8ec82fcb18 
							
						 
					 
					
						
						
							
							nixos/samba: Allow package version setting  
						
						
						
						
					 
					
						2015-01-03 21:45:16 -08:00 
						 
				 
			
				
					
						
							
							
								Nikolay Amiantov 
							
						 
					 
					
						
						
						
						
							
						
						
							a164a0b4c5 
							
						 
					 
					
						
						
							
							nixos/fprintd: add service and pam support  
						
						
						
						
					 
					
						2015-01-03 19:50:40 +03:00 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							8627110091 
							
						 
					 
					
						
						
							
							icedtea: Make major version nonspecific attrs  
						
						
						
						
					 
					
						2015-01-02 00:24:49 -08:00 
						 
				 
			
				
					
						
							
							
								Charles Strahan 
							
						 
					 
					
						
						
						
						
							
						
						
							94dd4b9721 
							
						 
					 
					
						
						
							
							ruby: WIP  
						
						
						
						
					 
					
						2014-12-30 21:05:00 -05:00 
						 
				 
			
				
					
						
							
							
								Tobias Geerinckx-Rice 
							
						 
					 
					
						
						
						
						
							
						
						
							c64257b8e5 
							
						 
					 
					
						
						
							
							Fix user-facing typos (mainly in descriptions)  
						
						
						
						
					 
					
						2014-12-30 03:31:03 +01:00 
						 
				 
			
				
					
						
							
							
								Jaka Hudoklin 
							
						 
					 
					
						
						
						
						
							
						
						
							1b19b7a3bf 
							
						 
					 
					
						
						
							
							Merge pull request  #5491  from offlinehacker/cadvisor  
						
						... 
						
						
						
						Add cadvisor package and nixos module 
						
						
					 
					
						2014-12-29 17:58:43 +01:00 
						 
				 
			
				
					
						
							
							
								Charles Strahan 
							
						 
					 
					
						
						
						
						
							
						
						
							145733c479 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby  
						
						... 
						
						
						
						Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix 
						
						
					 
					
						2014-12-28 14:29:52 -05:00 
						 
				 
			
				
					
						
							
							
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							43af22b2de 
							
						 
					 
					
						
						
							
							Merge pull request  #5487  from luke-clifton/lc-btsync-group  
						
						... 
						
						
						
						btsync groups 
						
						
					 
					
						2014-12-28 20:25:13 +01:00 
						 
				 
			
				
					
						
							
							
								Charles Strahan 
							
						 
					 
					
						
						
						
						
							
						
						
							4ed847d81d 
							
						 
					 
					
						
						
							
							redmine: fix use of bundler  
						
						
						
						
					 
					
						2014-12-28 14:22:11 -05:00 
						 
				 
			
				
					
						
							
							
								Jaka Hudoklin 
							
						 
					 
					
						
						
						
						
							
						
						
							b6198f08e3 
							
						 
					 
					
						
						
							
							nixos: add cadvisor service  
						
						
						
						
					 
					
						2014-12-28 20:21:41 +01:00 
						 
				 
			
				
					
						
							
							
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							ea9d391bb5 
							
						 
					 
					
						
						
							
							Fix ntpd  
						
						... 
						
						
						
						Since the 4.2.8 upgrade, ntpd is broken on NixOS:
  Dec 28 19:06:54 hagbard ntpd[27723]: giving up resolving host 1.nixos.pool.ntp.org: Servname not supported for ai_socktype (-8)
This appears to be because DNS resolution doesn't work in chroots
anymore (due to /etc being missing). So disable chroots for now. It's
probably better to use systemd's containment facilities anyway. 
						
						
					 
					
						2014-12-28 19:38:45 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							61d9f06760 
							
						 
					 
					
						
						
							
							fix a typo from 2627198b0c  
						
						
						
						
					 
					
						2014-12-28 10:44:50 +01:00 
						 
				 
			
				
					
						
							
							
								Luke Clifton 
							
						 
					 
					
						
						
						
						
							
						
						
							0c477eb38f 
							
						 
					 
					
						
						
							
							Documentation update  
						
						
						
						
					 
					
						2014-12-28 17:26:59 +08:00 
						 
				 
			
				
					
						
							
							
								Luke Clifton 
							
						 
					 
					
						
						
						
						
							
						
						
							61ff1b2b0a 
							
						 
					 
					
						
						
							
							Moved UMask to correct location  
						
						
						
						
					 
					
						2014-12-28 16:44:27 +08:00 
						 
				 
			
				
					
						
							
							
								Luke Clifton 
							
						 
					 
					
						
						
						
						
							
						
						
							5fdd6f6a66 
							
						 
					 
					
						
						
							
							Change umask  
						
						
						
						
					 
					
						2014-12-28 16:39:56 +08:00 
						 
				 
			
				
					
						
							
							
								William A. Kennington III 
							
						 
					 
					
						
						
						
						
							
						
						
							2627198b0c 
							
						 
					 
					
						
						
							
							nixos/firewall: Add ipset utility  
						
						
						
						
					 
					
						2014-12-28 00:04:49 -08:00 
						 
				 
			
				
					
						
							
							
								Luke Clifton 
							
						 
					 
					
						
						
						
						
							
						
						
							5866a9df03 
							
						 
					 
					
						
						
							
							added group  
						
						
						
						
					 
					
						2014-12-28 13:23:10 +08:00 
						 
				 
			
				
					
						
							
							
								Luke Clifton 
							
						 
					 
					
						
						
						
						
							
						
						
							fabcc2cf7b 
							
						 
					 
					
						
						
							
							Added btsync group to btsync user  
						
						
						
						
					 
					
						2014-12-28 13:17:37 +08:00 
						 
				 
			
				
					
						
							
							
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							3c050d00a5 
							
						 
					 
					
						
						
							
							upower: use newer version by default  
						
						... 
						
						
						
						Tested on KDE4, fixed with xfce, and was used with GNOME before.
CC @lethalman.
I did not test e19, as it won't build, probably due to #5392  @shlevy.
CC maintainer @matejc.
Also removed a forgotten unused patch. 
						
						
					 
					
						2014-12-27 22:46:46 +01:00 
						 
				 
			
				
					
						
							
							
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							ec5fcfa82c 
							
						 
					 
					
						
						
							
							network-manager: specify full path to sytemctl binary  
						
						... 
						
						
						
						(cherry picked from commit af8f76c2568ae9d842716d98673b3639292a920e)
Signed-off-by: Domen Kožar <domen@dev.si> 
						
						
					 
					
						2014-12-27 11:53:07 +01:00 
						 
				 
			
				
					
						
							
							
								Bjørn Forsman 
							
						 
					 
					
						
						
						
						
							
						
						
							0a8623d6a9 
							
						 
					 
					
						
						
							
							nixos/munin: add /var/setuid-wrappers to PATH  
						
						... 
						
						
						
						/var/setuid-wrappers is an extension of the system profile, so it
belongs in PATH for the munin service. 
						
						
					 
					
						2014-12-25 15:43:51 +01:00 
						 
				 
			
				
					
						
							
							
								aszlig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c7e3ddf7ff 
							
						 
					 
					
						
						
							
							nixos/synergy: Fix use of the "optional" function.  
						
						... 
						
						
						
						Commit 939edb1 reintroduced autoStart, but instead of creating a list of
units for the wantedBy list with optional it became a list of lists of
units.
Signed-off-by: aszlig <aszlig@redmoonstudios.org> 
						
						
					 
					
						2014-12-24 12:35:57 +01:00 
						 
				 
			
				
					
						
							
							
								Igor Pashev 
							
						 
					 
					
						
						
						
						
							
						
						
							2b91b9b594 
							
						 
					 
					
						
						
							
							Strongswan: updown script uses ip and iptables utilities  
						
						
						
						
					 
					
						2014-12-22 20:20:52 +00:00 
						 
				 
			
				
					
						
							
							
								Luca Bruno 
							
						 
					 
					
						
						
						
						
							
						
						
							79209e30b5 
							
						 
					 
					
						
						
							
							nixos: Add -verbose to xserverArgs example  
						
						
						
						
					 
					
						2014-12-22 21:01:12 +01:00 
						 
				 
			
				
					
						
							
							
								lethalman 
							
						 
					 
					
						
						
						
						
							
						
						
							50789593df 
							
						 
					 
					
						
						
							
							Merge pull request  #5346  from svenkeidel/disable-xserver-verbose-logging  
						
						... 
						
						
						
						disable verbose logging for XServer, fixes  #4333  
						
						
					 
					
						2014-12-22 20:59:06 +01:00 
						 
				 
			
				
					
						
							
							
								Benno Fünfstück 
							
						 
					 
					
						
						
						
						
							
						
						
							914b76bad4 
							
						 
					 
					
						
						
							
							services.mpd: use systemd's user option  
						
						... 
						
						
						
						For some reason, mpd fails to open the sound card if using mpd's user
option. Starting mpd directly as the mpd user works for me. 
						
						
					 
					
						2014-12-22 11:22:14 +00:00 
						 
				 
			
				
					
						
							
							
								lethalman 
							
						 
					 
					
						
						
						
						
							
						
						
							d0fdad5f36 
							
						 
					 
					
						
						
							
							Merge pull request  #5419  from ehmry/tox-bootstrapd  
						
						... 
						
						
						
						tox-bootstrapd 
						
						
					 
					
						2014-12-22 11:16:44 +01:00 
						 
				 
			
				
					
						
							
							
								Emery Hemingway 
							
						 
					 
					
						
						
						
						
							
						
						
							01910e84f9 
							
						 
					 
					
						
						
							
							nixos: tox-bootstrapd service  
						
						
						
						
					 
					
						2014-12-20 18:20:27 -05:00 
						 
				 
			
				
					
						
							
							
								wmertens 
							
						 
					 
					
						
						
						
						
							
						
						
							a8c726da56 
							
						 
					 
					
						
						
							
							Merge pull request  #5378  from benley/mesos  
						
						... 
						
						
						
						mesos-slave: add config option for slave attributes 
						
						
					 
					
						2014-12-19 08:10:07 +01:00 
						 
				 
			
				
					
						
							
							
								Evgeny Egorochkin 
							
						 
					 
					
						
						
						
						
							
						
						
							87610ca0fd 
							
						 
					 
					
						
						
							
							kde4: enable akonadi by default  
						
						
						
						
					 
					
						2014-12-19 08:59:22 +02:00