Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ...

Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix

2014-09-02 12:31:03 +02:00

..

amazon-config.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

amazon-image.nix

amazon-image.nix: Overwrite busybox swapon

2014-08-01 17:55:37 -04:00

container-config.nix

Containers: Use nsenter to execute commands in containers

2014-08-28 02:20:23 +02:00

containers.nix

Merge recent master into staging

2014-08-30 10:04:02 +02:00

docker-image.nix

nixos: virtualisation, add basic docker nixos image

2014-08-25 12:00:14 +02:00

docker.nix

Upgrade docker to 1.1.2 and add docker module

2014-07-28 21:45:49 +02:00

ec2-data.nix

amazon ec2: Make fetch-ec2-data more robust

2014-08-05 15:12:26 +02:00

google-compute-config.nix

Add initial configuration for Google Compute Engine

2013-12-11 15:32:27 +01:00

google-compute-image.nix

Google Compute image:

2014-08-01 15:25:50 +02:00

libvirtd.nix

Ensure libvirtd is started after vswitch and add ability to configure how libvirtd guests are shutdown

2014-09-02 01:48:50 +04:00

nixos-container.pl

nixos-container run: Execute command using ‘su’

2014-08-28 02:20:31 +02:00

nova-config.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

nova-image.nix

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

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

nova.nix

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

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

openvswitch.nix

formatting/retab

2014-09-02 01:48:50 +04:00

qemu-opts

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

qemu-vm.nix

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

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

virtualbox-guest.nix

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

virtualbox-image.nix

Fix evaluation in virtualbox-image.nix

2014-08-06 16:25:42 +02:00

xen-dom0.nix

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

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

xen-domU.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00