Author: eelco
Date: Wed Apr 27 13:01:42 2011
New Revision: 26989
URL: https://svn.nixos.org/websvn/nix/?rev=26989&sc=1
Log:
* nixos-build-vms/build-vms.nix: drop the "nixos" function argument,
since the path to the NixOS source tree is known.
Modified:
nixos/trunk/modules/installer/tools/nixos-build-vms/build-vms.nix
nixos/trunk/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
Modified: nixos/trunk/modules/installer/tools/nixos-build-vms/build-vms.nix
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-build-vms/build-vms.nix Wed Apr
27 12:49:55 2011 (r26988)
+++ nixos/trunk/modules/installer/tools/nixos-build-vms/build-vms.nix Wed Apr
27 13:01:42 2011 (r26989)
@@ -1,12 +1,11 @@
-{ nixos
-, nixpkgs
+{ nixpkgs
, services ? "/etc/nixos/services"
, system ? builtins.currentSystem
, networkExpr
}:
-let nodes = import networkExpr;
-in
-with import "${nixos}/lib/testing.nix" { inherit nixpkgs services system; };
+let nodes = import networkExpr; in
+
+with import ../../../../lib/testing.nix { inherit nixpkgs services system; };
(complete { inherit nodes; testScript = ""; }).driver
Modified: nixos/trunk/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
Wed Apr 27 12:49:55 2011 (r26988)
+++ nixos/trunk/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
Wed Apr 27 13:01:42 2011 (r26989)
@@ -48,11 +48,6 @@
# Validate the given options
-if [ -z "$NIXOS" ]
-then
- NIXOS=/etc/nixos/nixos
-fi
-
if [ "$@" = "" ]
then
echo "ERROR: A network expression must be specified!" >&2
@@ -63,4 +58,5 @@
# Build a network of VMs
-nix-build $NIXOS/modules/installer/tools/nixos-build-vms/build-vms.nix
--argstr networkExpr $networkExpr --argstr nixos $NIXOS --argstr nixpkgs
$NIXPKGS_ALL $noOutLinkArg $showTraceArg
+nix-build
${NIXOS:-/etc/nixos/nixos}/modules/installer/tools/nixos-build-vms/build-vms.nix
\
+ --argstr networkExpr $networkExpr --argstr nixpkgs
"${NIXPKGS_ALL:-/etc/nixos/nixpkgs}" $noOutLinkArg $showTraceArg
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
