Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
test-driver	nixos/log2html: Remove schema from jQuery URLs.	2014-06-27 09:41:11 +02:00
build-vms.nix
channel-expr.nix
eval-config.nix	no-x-libs.nix: Disable su xauth forwarding, and X11 dependency in dbus	2014-04-16 16:58:06 +02:00
from-env.nix
make-iso9660-image.nix
make-iso9660-image.sh	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
make-squashfs.nix
make-system-tarball.nix
make-system-tarball.sh	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
nixpkgs.nix
qemu-flags.nix
testing.nix	makeTest: Pass nodes attribute	2014-07-30 14:30:25 +02:00
utils.nix