Vladimír Čunát b4af993c3f Merge branch 'master' into staging ...

Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh

2014-11-14 14:28:23 +01:00

..

loader

Add cryptodisk support for Grub

2014-09-24 21:48:55 +01:00

emergency-mode.nix

…

kernel.nix

…

kexec.nix

…

luksroot.nix

…

modprobe.nix

…

pbkdf2-sha512.c

…

readonly-mountpoint.c

…

shutdown.nix

…

stage-1-init.sh

Merge branch 'master' into staging

2014-11-14 14:28:23 +01:00

stage-1.nix

Merge branch 'master' into staging

2014-11-14 14:28:23 +01:00

stage-2-init.sh

…

stage-2.nix

…

systemd-unit-options.nix

Replace hasAttr/getAttr calls with the ? and . operators

2014-10-05 01:11:06 +02:00

systemd.nix

Merge recent master into staging

2014-10-23 17:40:41 +02:00

tmp.nix

…