Vladimír Čunát 52404a868d Merge recent master into staging ...

Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix

2014-11-05 15:00:44 +01:00

..

loader

Add cryptodisk support for Grub

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

emergency-mode.nix

nixos: tmp on tmpfs option

2014-07-30 16:19:26 +02:00

kernel.nix

initrd.availableKernelModules: add support for keyboards

2014-08-12 20:00:01 +02:00

kexec.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

luksroot.nix

Remove useless use of optionSet.

2014-08-29 18:43:03 +02:00

modprobe.nix

Load EHCI befor OHCI and UHCI; from patch by Mathnerd314

2014-09-02 02:12:46 +04:00

pbkdf2-sha512.c

Update to the Yubikey PBA

2014-02-08 14:59:52 +01:00

readonly-mountpoint.c

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

shutdown.nix

Don't run hwclock if /dev/rtc doesn't exist

2014-05-05 16:47:51 +02:00

stage-1-init.sh

Create a udev rule for /dev/root

2014-10-10 17:18:04 +02:00

stage-1.nix

Merge recent master into staging

2014-11-05 15:00:44 +01:00

stage-2-init.sh

Containers: Don't remount /

2014-08-18 17:14:43 +02:00

stage-2.nix

nixos: tmp on tmpfs option

2014-07-30 16:19:26 +02:00

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

nixos: tmp on tmpfs option

2014-07-30 16:19:26 +02:00