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

…

generic-extlinux-compatible

…

grub

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

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

init-script

…

raspberrypi

…

systemd-boot

Include date and NixOS version in systemd-boot entries

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

efi.nix

…

loader.nix

…