From cdca66d7e8af90daa03fab564fa358df16b7421c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 27 Sep 2018 17:03:23 +0200
Subject: Add pkgs.nixosTest

---
 nixos/lib/build-vms.nix | 14 ++++++++++++--
 nixos/lib/testing.nix   | 13 ++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'nixos')

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 933f81392491..024f4414ebeb 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -1,4 +1,13 @@
-{ system, pkgs, minimal ? false, config ? {} }:
+{ system
+, # Use a minimal kernel?
+  minimal ? false
+, # Ignored
+  config ? null
+  # Nixpkgs, for qemu, lib and more
+, pkgs
+, # NixOS configuration to add to the VMs
+  extraConfigurations ? []
+}:
 
 with pkgs.lib;
 with import ../lib/qemu-flags.nix { inherit pkgs; };
@@ -28,7 +37,8 @@ rec {
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
           { key = "no-manual"; documentation.nixos.enable = false; }
           { key = "qemu"; system.build.qemu = qemu; }
-        ] ++ optional minimal ../modules/testing/minimal-kernel.nix;
+        ] ++ optional minimal ../modules/testing/minimal-kernel.nix
+          ++ extraConfigurations;
       extraArgs = { inherit nodes; };
     };
 
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index f90fc9f7df0e..690f7dfd5fac 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -1,6 +1,13 @@
-{ system, pkgs, minimal ? false, config ? {} }:
-
-with import ./build-vms.nix { inherit system pkgs minimal config; };
+{ system
+, pkgs
+  # Use a minimal kernel?
+, minimal ? false
+  # Ignored
+, config ? null
+  # Modules to add to each VM
+, extraConfigurations ? [] }:
+
+with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; };
 with pkgs;
 
 let
-- 
cgit 1.4.1