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
..
amazon-image.nix	nixos: introduce boot.growPartition (#33521)	2018-01-06 13:52:51 +00:00
amazon-init.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
amazon-options.nix	Fix eval error due to config.ec2.hvm	2017-04-04 13:49:13 +02:00
azure-agent-entropy.patch
azure-agent.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
azure-bootstrap-blobs.nix	add Azure bootstrap blob list	2016-09-15 16:27:47 +03:00
azure-common.nix	openssh: support prohibit-password for permitRootLogin	2016-10-01 13:23:56 -04:00
azure-config-user.nix
azure-config.nix
azure-image.nix	azure-image: switch to use the common make-disk-image.nix	2017-04-25 02:59:13 +00:00
azure-images.nix	Add file with Azure image locations, similar to ec2-amis.nix. Will be used by nixops.	2017-07-18 09:18:51 +00:00
azure-qemu-220-no-etc-install.patch
brightbox-config.nix
brightbox-image.nix	nixos: rename config.system.nixos* -> config.system.nixos.*	2018-02-18 12:56:30 +00:00
container-config.nix	nixos/containers: Enable use of the network.useHostResolvConf option (#34354)	2018-01-28 14:42:15 +00:00
containers.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
docker-image.nix
docker.nix	docker: Allow package selection in module	2017-09-04 19:02:05 -04:00
ec2-amis.nix	EC2 AMIs: 17.09.2356.cb751f9b1c3 -> 17.09.2681.59661f21be6	2018-01-10 13:16:49 +01:00
ec2-data.nix
ecs-agent.nix	nixos/modules: use defaultText/literalExample where applicable	2017-03-07 14:06:08 +01:00
gce-images.nix	Add file with GCE image locations, similar to ec2-amis.nix. Will be used by nixops.	2017-07-18 09:16:15 +00:00
google-compute-config.nix
google-compute-image.nix	nixos: rename config.system.nixos* -> config.system.nixos.*	2018-02-18 12:56:30 +00:00
grow-partition.nix	nixos: introduce boot.growPartition (#33521)	2018-01-06 13:52:51 +00:00
hyperv-guest.nix	hyperv-daemons: add nixos module	2018-01-04 21:09:01 +08:00
libvirtd.nix	nixos/libvirtd: add qemu-img to $PATH of the daemon	2018-01-19 16:28:01 +00:00
lxc-container.nix
lxc.nix	lxc: ensure directory /var/lib/lxc/rootfs	2017-03-15 12:42:27 +01:00
lxcfs.nix	lxcfs: remove cgmanager dependency	2017-11-07 11:04:12 +00:00
lxd.nix	nixos/lxd: partial fix	2018-02-10 17:18:53 +09:00
nova-config.nix	nixos: introduce boot.growPartition (#33521)	2018-01-06 13:52:51 +00:00
openvswitch.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
parallels-guest.nix	parallels: add package config option	2018-03-01 17:09:13 -06:00
qemu-vm.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
rkt.nix	nixos/treewide: systemd.time is in manvolume 7	2017-03-21 08:28:53 +01:00
virtualbox-guest.nix	virtualbox guest module: make x11 optional	2016-12-04 22:24:01 +01:00
virtualbox-host.nix	Virtualbox: Fix type error in networking.interfaces.vboxnet0.ipv4.addresses	2018-02-19 17:48:15 +01:00
virtualbox-image.nix	nixos: rename config.system.nixos* -> config.system.nixos.*	2018-02-18 12:56:30 +00:00
vmware-guest.nix	open-vm-tools: do not pull x dependencies unconditionally	2017-08-15 17:05:30 +08:00
xe-guest-utilities.nix
xen-dom0.nix	xen 4.10: link /etc/xen/oxenstored.conf	2018-03-07 22:39:19 +01:00
xen-domU.nix	xen: update domU config for pvgrub2	2017-02-12 20:53:54 +01:00