Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ...

Let's get rid of those merge conflicts.

2016-02-03 16:57:19 +01:00

..

loader

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

coredump.nix

Added config options for systemd-coredump functionality.

2015-05-24 18:22:53 -06:00

emergency-mode.nix

nixos: tmp on tmpfs option

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

initrd-network.nix

treewide: Mass replace 'glibc}/lib' to refer the 'out' output

2016-01-24 10:03:35 +02:00

kernel.nix

types: remove references to new packageSet

2016-01-17 19:49:38 +00: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

treewide: Mass replace 'openssl}/lib' to refer the 'out' output

2016-01-24 10:03:38 +02:00

modprobe.nix

kmod-debian-aliases: init at 21-1

2015-09-13 10:55:44 +02:00

networkd.nix

networkd: add DHCPServer config section

2015-12-23 06:04:39 +01: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

resolved.nix

Create systemd-{network,resolve} user/group unconditionally

2015-07-22 12:23:45 +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

NixOS tests: Increase hung_task_timeout_secs

2016-01-04 16:53:42 +01:00

stage-1.nix

Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00

stage-2-init.sh

stage-2: Don't run hwclock in containers

2015-07-22 12:23:52 +02:00

stage-2.nix

nixos/stage-2: Build readonly-mountpoint with normal mkDerivation phases

2015-10-03 14:08:55 +02:00

systemd-lib.nix

Set ‘allowSubstitutes = false’ on various derivations

2015-07-09 15:10:37 +02:00

systemd-unit-options.nix

systemd module: Add OnFailure to systemd common unit options

2015-11-16 15:12:28 +01:00

systemd.nix

systemd service: add *.busname upstream units

2016-01-18 19:42:25 +03:00

timesyncd.nix

Don't include networkd units unless enabled

2015-04-19 22:06:45 +02:00

tmp.nix

nixos: tmp on tmpfs option

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