Domen Kožar bb4d658f64 Merge branch 'master' into staging ... Conflicts: nixos/doc/manual/release-notes/rl-unstable.xml nixos/modules/services/printing/cupsd.nix pkgs/applications/misc/calibre/default.nix pkgs/development/haskell-modules/hackage-packages.nix pkgs/development/libraries/libsodium/default.nix pkgs/misc/emulators/wine/unstable.nix pkgs/top-level/all-packages.nix		2015-05-11 10:05:23 +02:00
..
amqp	nixos/rabbitmq: fix module	2015-01-26 02:09:04 +01:00
audio	nixos: add actkbd module and sound.enableMediaKeys option	2015-04-20 17:11:19 +00:00
backup	tarsnap: fix up permissions of existing cache directories	2015-05-04 18:58:35 +00:00
cluster	nixos/kubernetes: fix module	2015-04-25 14:18:25 +02:00
computing	slurm: impl basic configuration	2015-03-07 00:26:57 +03:00
continuous-integration/jenkins	Merge recent master into staging	2014-09-13 21:48:29 +02:00
databases	mysql: /run/mysql now 0755 (instead 0700)	2015-05-07 01:51:05 +02:00
desktops	GNOME 3.16.1, closes #7357	2015-04-25 12:02:33 +02:00
games	allow changing minecraft data dir + allow opening firewall	2015-04-07 14:10:13 +00:00
hardware	Added BRLTTY package	2015-04-29 23:02:09 +02:00
logging	nixos/fluentd: add support for config reload	2015-04-25 14:21:27 +02:00
mail	postfix service: description enhancement	2015-05-06 21:53:39 +02:00
misc	mesos service: only pass --zk if quorum > 0	2015-05-10 19:36:20 -04:00
monitoring	Merge pull request #7181 from jagajaga/teamviewer	2015-04-06 14:13:07 +02:00
network-filesystems	nixos.samba: update required mounts	2015-04-16 20:18:03 +03:00
networking	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
printing	Revert "cups: Rename "browsing" config option to "advertise""	2015-05-10 20:47:50 +02:00
scheduling	Merge pull request #6452 from rushmorem/update-chronos-port	2015-02-19 14:13:00 +01:00
search	java: More default cleanups	2015-01-07 14:55:41 -08:00
security	Add hologram service	2015-04-23 14:30:12 -04:00
system	Remove fixed uids for nscd, sshd	2015-04-19 22:06:45 +02:00
torrent	Simplify (and fix) settings for transmission module.	2015-02-26 22:21:27 +00:00
ttys	agetty: Add autologinUser config option	2015-04-14 10:45:28 +03:00
web-servers	Merge pull request #7605 from ip1981/wiki	2015-04-28 19:00:27 +03:00
x11	plasma53: patch upstream startkde	2015-05-03 17:09:50 -05:00