Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/servers/serfdom/default.nix

2014-07-01 11:25:41 +02:00

..

test-driver

nixos/log2html: Remove schema from jQuery URLs.

2014-06-27 09:41:11 +02:00

build-vms.nix

Add a regression test for hostname / nss_myhostname

2013-11-26 18:52:34 +01:00

channel-expr.nix

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

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

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

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

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

make-iso9660-image.nix

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

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

make-iso9660-image.sh

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

make-squashfs.nix

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

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

make-system-tarball.nix

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

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

make-system-tarball.sh

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

nixpkgs.nix

Terrible backward compatibility hack

2013-10-11 13:36:09 +02:00

qemu-flags.nix

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

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

testing.nix

support for nixos test names

2014-06-28 16:05:03 +02:00

utils.nix

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

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