Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05:00
..
loader	nixos: gummiboot: change default to 1000 if boot.loader.timeout is null	2015-01-30 10:36:21 +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	nixos/modules/system/boot/luksroot.nix: hyperlinkify an URL in the documentation	2014-12-15 16:31:18 +01:00
modprobe.nix	nixos/modprobe: wrap all of kmod	2015-01-06 16:39:00 +03: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	Typo	2014-12-19 14:38:33 +01:00
stage-1.nix	rename occurrences of gcc.gcc to gcc.cc	2015-01-14 20:47:49 -08:00
stage-2-init.sh	Paranoia	2015-01-15 18:37:55 +01:00
stage-2.nix	nixos: tmp on tmpfs option	2014-07-30 16:19:26 +02:00
systemd-unit-options.nix	systemd: extend checkUnitConfig with on-abnormal	2015-01-19 11:41:18 +01:00
systemd.nix	Merge pull request #5507 from DamienCassou/systemd-user-timers	2014-12-30 15:40:43 +01:00
tmp.nix	nixos: tmp on tmpfs option	2014-07-30 16:19:26 +02:00