Eelco Dolstra 01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219 ... Conflicts: pkgs/os-specific/linux/systemd/fixes.patch pkgs/os-specific/linux/upower/0.99.nix pkgs/top-level/all-packages.nix		2015-09-21 12:57:30 +02:00
..
config	nixos: fix some types	2015-09-18 18:48:50 +00:00
hardware
installer
misc	kibana service: init	2015-09-19 00:33:44 +02:00
profiles	nixos: add xfs support to profiles/minimal	2015-09-18 18:58:18 +00:00
programs	nixos: fix some types	2015-09-18 18:48:50 +00:00
security	nixos: fix some types	2015-09-18 18:48:50 +00:00
services	Revert "Don't evaluate haskellPackages when gitit is disabled"	2015-09-20 21:40:17 +02:00
system	Merge remote-tracking branch 'origin/master' into systemd-219	2015-09-21 12:57:30 +02:00
tasks	nixos: fix some types	2015-09-18 18:48:50 +00:00
testing
virtualisation	Merge pull request #9925 from oxij/nixos-cleanups-and-fixes	2015-09-19 00:28:49 +02:00
module-list.nix	Remove Gitit from the list of evaluated modules	2015-09-20 21:40:16 +02:00
rename.nix