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

Merge pull request #89361 from helsinki-systems/feat/test-special-args

Browse Source 
nixos/testing: Add support for specialArgs
This commit is contained in:
Jacek Galowicz 2020-09-16 07:07:42 +02:00 committed by GitHub
commit 713f881769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/lib/build-vms.nix
View File

@ -3,8 +3,10 @@
minimal ? false minimal ? false
, # Ignored , # Ignored
config ? null config ? null
# Nixpkgs, for qemu, lib and more , # Nixpkgs, for qemu, lib and more
, pkgs pkgs
, # !!! See comment about args in lib/modules.nix
specialArgs ? {}
, # NixOS configuration to add to the VMs , # NixOS configuration to add to the VMs
extraConfigurations ? [] extraConfigurations ? []
}: }:
@ -31,7 +33,7 @@ rec {
nodes: configurations: nodes: configurations:
import ./eval-config.nix { import ./eval-config.nix {
inherit system; inherit system specialArgs;
modules = configurations ++ extraConfigurations; modules = configurations ++ extraConfigurations;
baseModules = (import ../modules/module-list.nix) ++ baseModules = (import ../modules/module-list.nix) ++
[ ../modules/virtualisation/qemu-vm.nix [ ../modules/virtualisation/qemu-vm.nix

4
nixos/lib/testing-python.nix
View File

@ -4,10 +4,12 @@
, minimal ? false , minimal ? false
# Ignored # Ignored
, config ? {} , config ? {}
# !!! See comment about args in lib/modules.nix
, specialArgs ? {}
# Modules to add to each VM # Modules to add to each VM
, extraConfigurations ? [] }: , extraConfigurations ? [] }:
with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with import ./build-vms.nix { inherit system pkgs minimal specialArgs extraConfigurations; };
with pkgs; with pkgs;
rec { rec {