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

..

generations-dir

fix indentation in several nixos option descriptions

2016-12-16 18:29:25 +01:00

generic-extlinux-compatible

extlinux-conf-builder: Choose whether to use DTBs on per-generation basis

2016-07-10 03:03:51 +03:00

grub

Merge remote-tracking branch 'upstream/master' into staging

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

init-script

…

raspberrypi

raspberryPi boot loader: don't remove xx-initrd files

2017-02-12 02:48:57 +02:00

systemd-boot

Include date and NixOS version in systemd-boot entries

2017-09-02 14:28:34 -04:00

efi.nix

Use systemd-boot instead of gummiboot

2016-05-31 17:02:47 +02:00

loader.nix

…