Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
loader	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
binfmt.nix	nixos/binfmt: Initial binfmt_msc support.	2018-02-18 12:42:17 -05:00
coredump.nix
emergency-mode.nix
grow-partition.nix	nixos: introduce boot.growPartition (#33521)	2018-01-06 13:52:51 +00:00
initrd-network.nix	nixos/initrd-network: add udhcpc.extraArgs option (#36305)	2018-03-05 15:53:59 +00:00
initrd-ssh.nix	initrd-ssh: Fix for new dropbear version.	2018-03-01 21:21:27 -05:00
kernel.nix	nixos/boot: allow kernel.printk override (#34958)	2018-02-17 06:47:33 +00:00
kexec.nix	nixos: kexec: Disable on non-keexecable systems.	2018-02-28 15:01:31 -05:00
luksroot.nix	Merge pull request #30416 from symphorien/luksnokey	2018-03-05 10:02:39 +00:00
modprobe.nix	modprobe activation: Order after specialfs	2018-02-05 21:04:40 +01:00
networkd.nix	Revert "networkd: also load builtin modules"	2018-03-04 06:29:08 +00:00
pbkdf2-sha512.c
plymouth.nix	plymouth: Fix reference to NixOS version	2018-02-19 11:05:32 -05:00
resolved.nix	systemd: 234 -> 237	2018-02-13 01:24:24 +01:00
shutdown.nix
stage-1-init.sh	makeModulesClosure: support firmware	2018-02-16 00:11:07 +02:00
stage-1.nix	nixos: Fix initrd dependency detection when cross-compiling.	2018-03-01 13:31:36 -05:00
stage-2-init.sh	Move creation of /root to the activation script	2018-02-05 22:12:18 +01:00
stage-2.nix	stage-2-init: Use the host bash as SHELL	2018-03-01 14:03:41 -05:00
systemd-lib.nix	nixos: escape brackets in systemd units	2017-04-12 15:56:26 +02:00
systemd-nspawn.nix	systemd-nspawn: relax PrivateUsers check	2017-05-27 08:27:47 +01:00
systemd-unit-options.nix	systemd: better document enabled, wantedBy, and requiredBy (#29453)	2017-09-16 12:48:16 +02:00
systemd.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
timesyncd.nix	ntp: make timesyncd the new default	2016-12-17 00:00:45 +01:00
tmp.nix