From 65323269daa7869cbe867871097904f79b9ed973 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Tue, 24 May 2022 05:04:49 +0100 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/76e3df7c0687d5b9ff31431fd4ee4d4cd07a4b2f' (2022-02-03) → 'github:nixos/nixpkgs/dfd82985c273aac6eced03625f454b334daae2e8' (2022-05-20) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 18c47f3..6c8028c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1643852787, - "narHash": "sha256-RHrvroV61jcfTXfW0Rwc0qu/8lHmfYxSy49adyXkB0I=", + "lastModified": 1653060744, + "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76e3df7c0687d5b9ff31431fd4ee4d4cd07a4b2f", + "rev": "dfd82985c273aac6eced03625f454b334daae2e8", "type": "github" }, "original": { -- 2.45.3 From 77cdda9589f49af27557d0be936e661e6531e426 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Tue, 24 May 2022 05:06:57 +0100 Subject: [PATCH 2/2] tests/vmTest: remove empty argument set in baseConfig Upstream Nixpkgs changed the behavior of the makeTest function so now this is no longer required --- tests/vmTest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vmTest/default.nix b/tests/vmTest/default.nix index 8dbcffb..ef16371 100644 --- a/tests/vmTest/default.nix +++ b/tests/vmTest/default.nix @@ -32,7 +32,7 @@ let outputs = { self, nixpkgs }: let makeTest = (import (nixpkgs + "/nixos/lib/testing-python.nix") { system = "${pkgs.hostPlatform.system}"; }).makeTest; - baseConfig = ((makeTest { nodes.baseConfig = { ... }: {}; testScript = "";}).nodes {}).baseConfig.extendModules { + baseConfig = ((makeTest { nodes.baseConfig = { ... }: {}; testScript = "";}).nodes).baseConfig.extendModules { modules = [ ${builtins.readFile ./nixinateeBase.nix} ${builtins.readFile ./nixinateeAdditional.nix} -- 2.45.3