Author: sandervanderburg
Date: Tue Oct 12 18:42:38 2010
New Revision: 24244
URL: https://svn.nixos.org/websvn/nix/?rev=24244&sc=1
Log:
Fixed use of mkOverride which has changed in newer NixOS releases
Modified:
disnix/disnix-vm-addons/trunk/data/qemu-vm.nix
Modified: disnix/disnix-vm-addons/trunk/data/qemu-vm.nix
==============================================================================
--- disnix/disnix-vm-addons/trunk/data/qemu-vm.nix Tue Oct 12 18:33:02
2010 (r24243)
+++ disnix/disnix-vm-addons/trunk/data/qemu-vm.nix Tue Oct 12 18:42:38
2010 (r24244)
@@ -200,7 +200,7 @@
# where the regular value for the `fileSystems' attribute should be
# disregarded for the purpose of building a VM test image (since
# those filesystems don't exist in the VM).
- fileSystems = mkOverride 50 {}
+ fileSystems = mkOverride 50
[ { mountPoint = "/";
device = "/dev/vda";
}
@@ -221,7 +221,7 @@
# host filesystem and thus deadlocks the system.
networking.useDHCP = false;
- networking.defaultGateway = mkOverride 200 {} "10.0.2.2";
+ networking.defaultGateway = mkOverride 200 "10.0.2.2";
networking.nameservers = [ "10.0.2.3" ];
@@ -249,13 +249,13 @@
# When building a regular system configuration, override whatever
# video driver the host uses.
- services.xserver.videoDriver = mkOverride 50 {} null;
- services.xserver.videoDrivers = mkOverride 50 {} [ "cirrus" "vesa" ];
- services.xserver.defaultDepth = mkOverride 50 {} 0;
- services.xserver.resolutions = mkOverride 50 {} [];
+ services.xserver.videoDriver = mkOverride 50 null;
+ services.xserver.videoDrivers = mkOverride 50 [ "cirrus" "vesa" ];
+ services.xserver.defaultDepth = mkOverride 50 0;
+ services.xserver.resolutions = mkOverride 50 [];
services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
# Wireless won't work in the VM.
- networking.enableWLAN = mkOverride 50 {} false;
+ networking.enableWLAN = mkOverride 50 false;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
