Thomas Tuegel 6a004bf9c8 Merge branch 'master' into bugfix/staging/stdenv		2017-07-21 20:36:34 -05:00
..
config	Merge pull request #27000 from Balletie/fix/pulseaudio-alsa-conf	2017-07-17 08:20:38 +02:00
hardware
i18n/input-method
installer	nix: 1.11.12 -> 1.11.13	2017-07-18 10:54:01 +02:00
misc
profiles	all-hardware.nix: add VMware support. (#27430)	2017-07-17 02:38:10 +02:00
programs	programs.gnupg: use extraInit instead of interactiveShellInit	2017-07-17 18:45:37 +02:00
security
service-managers
services	Merge branch 'master' into bugfix/staging/stdenv	2017-07-21 20:36:34 -05:00
system
tasks
testing
virtualisation	Add file with Azure image locations, similar to ec2-amis.nix. Will be used by nixops.	2017-07-18 09:18:51 +00:00
module-list.nix	Merge pull request #27410 from florianjacob/journalwatch	2017-07-18 08:19:33 +01:00
rename.nix