Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix

2018-03-13 23:04:18 +02:00

..

grub.nix

nixos: Move uses of stdenv.shell to runtimeShell.

2018-03-01 14:38:53 -05: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