alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #144014 from hercules-ci/fix-nixosTest-infinite-recursion

Browse source 
nixosTest: Fix infinite recursion involving hasContext testScript whe…
This commit is contained in:
Robert Hensing 2021-10-31 18:49:05 +01:00 committed by GitHub
parent 50f4571c35 56c4f9d005
commit 3028246ac0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nixos/lib/testing-python.nix
View file

@ -218,6 +218,7 @@ rec {
build-vms = import ./build-vms.nix { build-vms = import ./build-vms.nix {
inherit system lib pkgs minimal specialArgs; inherit system lib pkgs minimal specialArgs;
extraConfigurations = extraConfigurations ++ [( extraConfigurations = extraConfigurations ++ [(
{ config, ... }:
{ {
virtualisation.qemu.package = qemu_pkg; virtualisation.qemu.package = qemu_pkg;
@ -230,7 +231,17 @@ rec {
# copied to the image. # copied to the image.
virtualisation.additionalPaths = virtualisation.additionalPaths =
lib.optional lib.optional
(builtins.hasContext testScript') # A testScript may evaluate nodes, which has caused
# infinite recursions. The demand cycle involves:
# testScript -->
# nodes -->
# toplevel -->
# additionalPaths -->
# hasContext testScript' -->
# testScript (ad infinitum)
# If we don't need to build an image, we can break this
# cycle by short-circuiting when useNixStoreImage is false.
(config.virtualisation.useNixStoreImage && builtins.hasContext testScript')
(pkgs.writeStringReferencesToFile testScript'); (pkgs.writeStringReferencesToFile testScript');
# Ensure we do not use aliases. Ideally this is only set # Ensure we do not use aliases. Ideally this is only set