Tuomas Tynkkynen be0e48e48f Merge remote-tracking branch 'upstream/master' into staging		2017-01-27 02:18:44 +02:00
..
config	Fix typo in pulseaudio.nix	2017-01-26 20:52:33 +01:00
hardware	Merge pull request #21995 from abbradar/opencl	2017-01-20 12:09:17 +03:00
i18n/input-method	nixos/ibus: fix custom panel example	2017-01-24 12:52:39 -06:00
installer	installer: sd-image-*.nix: Document how to build them	2017-01-25 15:07:37 +02:00
misc	locate: build in correct dbpath	2017-01-26 12:57:03 +01:00
profiles	install-device: correct command to start sshd	2017-01-25 21:09:31 +01:00
programs	locate: build in correct dbpath	2017-01-26 12:57:03 +01:00
security	nixos/acme: add random delay to timer	2017-01-25 19:15:04 +01:00
services	Merge pull request #21311 from makefu/services/logstash	2017-01-25 22:11:40 +01:00
system	systemd: 231 -> 232	2017-01-26 17:52:52 +01:00
tasks	Merge pull request #21578 from Mic92/zfs	2017-01-05 12:52:56 +01:00
testing	virtualisation.qemu.program: Remove	2016-12-20 10:52:46 +01:00
virtualisation	EC2 AMIs: 16.09.666.3738950 -> 16.09.1508.3909827	2017-01-18 12:42:39 +01:00
module-list.nix	add kresd service with basic options	2017-01-25 18:46:28 +01:00
rename.nix	locate: enhance mlocate support	2017-01-26 12:57:02 +01:00