ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

nixos/testing: Add support for specialArgs

Browse Source 
Since using flakes disallows the usage of <unstable> (which I use in
some tests), this adds an alternative. By setting specialArgs, all VMs
can get the `unstable` flake input as an arg. This is not possible with
extraConfigurations, as that would lead to infinite recursions.
This commit is contained in:
Janne Heß 2020-06-02 16:27:07 +02:00
parent 5457fc7c76
commit 9f33ab62d9
No known key found for this signature in database
GPG Key ID: 69165158F05265DF
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
, # Ignored
config ? null
# Nixpkgs, for qemu, lib and more
, pkgs
, # Nixpkgs, for qemu, lib and more
pkgs
, # !!! See comment about args in lib/modules.nix
specialArgs ? {}
, # NixOS configuration to add to the VMs
extraConfigurations ? []
}:
@ -31,7 +33,7 @@ rec {
nodes: configurations:
import ./eval-config.nix {
inherit system;
inherit system specialArgs;
modules = configurations ++ extraConfigurations;
baseModules = (import ../modules/module-list.nix) ++
[ ../modules/virtualisation/qemu-vm.nix

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

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