Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ...

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

2014-08-04 16:51:47 +02:00

..

loader

grub: Allow setting the boot root explicitly

2014-05-01 10:56:55 -04:00

emergency-mode.nix

nixos: tmp on tmpfs option

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

kernel.nix

Merge branch 'modulesfix' of git://github.com/kirelagin/nixpkgs

2014-04-21 07:51:31 -04: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

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

modprobe.nix

modprobe.nix: Use modern environment.etc syntax

2014-07-31 22:09:51 +02: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

Mount unionfs-fuse filesystems using the normal fileSystems option

2014-07-30 16:04:15 +02:00

stage-1.nix

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00

stage-2-init.sh

nixos: tmp on tmpfs option

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

stage-2.nix

nixos: tmp on tmpfs option

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

systemd-unit-options.nix

Refactor unit option declarations

2014-04-17 23:35:05 +02:00

systemd.nix

nixos: tmp on tmpfs option

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

tmp.nix

nixos: tmp on tmpfs option

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