From 4de46cd3396e4600f84b0dfb1366d22fe9eb2857 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 3 Apr 2022 17:16:01 -0700 Subject: [PATCH] flake.lock: Update --- flake.lock | 24 ++++++++++++------------ integration-tests/tools.nix | 4 +++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 7fc833d0..202f3626 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1647297614, - "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=", + "lastModified": 1648632716, + "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58", + "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "stable": { "locked": { - "lastModified": 1646588256, - "narHash": "sha256-ZHljmNlt19nSm0Mz8fx6QEhddKUkU4hhwFmfNmGn+EY=", + "lastModified": 1648965846, + "narHash": "sha256-xaO0KS+sgZLYrhaQNjVe6eRcOUIM1mEkAjT+dRbPblU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04", + "rev": "0aac710801aec4ba545527cf41a5706028fe6271", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "utils": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { diff --git a/integration-tests/tools.nix b/integration-tests/tools.nix index 452c7382..85d25aaa 100644 --- a/integration-tests/tools.nix +++ b/integration-tests/tools.nix @@ -130,6 +130,8 @@ let ''; makeTest = test: let + customArgs = [ "bundle" ]; + targetList = "[${concatStringsSep ", " targets}]"; fullScript = '' @@ -170,7 +172,7 @@ let combined = { inherit nodes; - } // test // { + } // (removeAttrs test customArgs) // { testScript = fullScript; }; in lib.makeOverridable pkgs.nixosTest combined;