summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-10-03 19:57:50 +0200
committerVladimír Čunát <v@cunat.cz>2020-10-03 20:06:26 +0200
commit30e98a4fd67c71277ee95c58c8fd691b69a09183 (patch)
tree7dd4d90d3c589cec5759fc1788f0233e428b6610
parent748871ad4203a979886752226fabea9d13e83c73 (diff)
downloadnixpkgs-30e98a4fd67c71277ee95c58c8fd691b69a09183.tar
nixpkgs-30e98a4fd67c71277ee95c58c8fd691b69a09183.tar.gz
nixpkgs-30e98a4fd67c71277ee95c58c8fd691b69a09183.tar.bz2
nixpkgs-30e98a4fd67c71277ee95c58c8fd691b69a09183.tar.lz
nixpkgs-30e98a4fd67c71277ee95c58c8fd691b69a09183.tar.xz
nixpkgs-30e98a4fd67c71277ee95c58c8fd691b69a09183.tar.zst
nixpkgs-30e98a4fd67c71277ee95c58c8fd691b69a09183.zip
nixosTests.ec2-config: avoid an evaluation problem
The problem was introduced by commit 97a32bc (within PR #79696).
nixos/tests/common/ec2.nix:6:17 called with unexpected argument 'meta'
-rw-r--r--nixos/tests/common/ec2.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix
index 502fe96231f..52d0310ac72 100644
--- a/nixos/tests/common/ec2.nix
+++ b/nixos/tests/common/ec2.nix
@@ -3,7 +3,7 @@
 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
       metaData = pkgs.stdenv.mkDerivation {
         name = "metadata";
@@ -59,5 +59,7 @@ with pkgs.lib;
 
         machine = create_machine({"startCommand": start_command})
       '' + script;
+
+      inherit meta;
     };
 }