public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* nixos-build-vms/build-vms.nix: drop the "nixos" function argument,

Browse Source 
since the path to the NixOS source tree is known.

svn path=/nixos/trunk/; revision=26989
This commit is contained in:
Eelco Dolstra 2011-04-27 13:01:42 +00:00
parent 0f544f1ea8
commit be7a7a5b78
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/installer/tools/nixos-build-vms/build-vms.nix
View File

@ -1,12 +1,11 @@
{ nixos { nixpkgs
, nixpkgs
, services ? "/etc/nixos/services" , services ? "/etc/nixos/services"
, system ? builtins.currentSystem , system ? builtins.currentSystem
, networkExpr , networkExpr
}: }:
let nodes = import networkExpr; let nodes = import networkExpr; in
in
with import "${nixos}/lib/testing.nix" { inherit nixpkgs services system; }; with import ../../../../lib/testing.nix { inherit nixpkgs services system; };
(complete { inherit nodes; testScript = ""; }).driver (complete { inherit nodes; testScript = ""; }).driver

8
modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
View File

@ -48,11 +48,6 @@ shift
# Validate the given options # Validate the given options
if [ -z "$NIXOS" ]
then
NIXOS=/etc/nixos/nixos
fi
if [ "$@" = "" ] if [ "$@" = "" ]
then then
echo "ERROR: A network expression must be specified!" >&2 echo "ERROR: A network expression must be specified!" >&2
@ -63,4 +58,5 @@ fi
# Build a network of VMs # 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