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

nixosTests.ec2-config: avoid an evaluation problem

Browse Source 
The problem was introduced by commit 97a32bc (within PR #79696).
nixos/tests/common/ec2.nix:6:17 called with unexpected argument 'meta'
This commit is contained in:
Vladimír Čunát 2020-10-03 19:57:50 +02:00
parent 748871ad42
commit 30e98a4fd6
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/common/ec2.nix
View File

@ -3,7 +3,7 @@
with pkgs.lib; with pkgs.lib;
{ {
makeEc2Test = { name, image, userData, script, hostname ? "ec2-instance", sshPublicKey ? null }: makeEc2Test = { name, image, userData, script, hostname ? "ec2-instance", sshPublicKey ? null, meta ? {} }:
let let
metaData = pkgs.stdenv.mkDerivation { metaData = pkgs.stdenv.mkDerivation {
name = "metadata"; name = "metadata";
@ -59,5 +59,7 @@ with pkgs.lib;
machine = create_machine({"startCommand": start_command}) machine = create_machine({"startCommand": start_command})
'' + script; '' + script;
inherit meta;
}; };
} }