Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master ... Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix		2018-03-15 22:30:56 +02:00
..
grub.nix	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
install-grub.pl	grub-install.pl: more details on blkid failure	2018-03-12 17:32:59 +09:00
ipxe.nix	Add missing 'type', 'defaultText' and 'literalExample' in module definitions	2016-01-17 19:41:23 +01:00
memtest.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00