diff --git a/flake.lock b/flake.lock index fea6cc8..62f76da 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654230545, - "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", + "lastModified": 1656372800, + "narHash": "sha256-1u9SDLXvKix/QejNb2sY2J2QZXnbe/14MnLtn+ln9j0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", + "rev": "020c74014b9e2fa905bb4059c979965816cd9118", "type": "github" }, "original": { @@ -42,16 +42,16 @@ }, "stable": { "locked": { - "lastModified": 1653996475, - "narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=", + "lastModified": 1656433693, + "narHash": "sha256-m29hSYsu2U+tnBo5v1/2RGo3lYY6KKb52MHV/89NeCs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3", + "rev": "babb041b7167008af3faca4c78f9dd8c6e83ef3a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 1bf1ee4..0ab785f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - stable.url = "github:NixOS/nixpkgs/nixos-21.11"; + stable.url = "github:NixOS/nixpkgs/nixos-22.05"; utils.url = "github:numtide/flake-utils"; diff --git a/integration-tests/tools.nix b/integration-tests/tools.nix index 5527fa0..a165ef2 100644 --- a/integration-tests/tools.nix +++ b/integration-tests/tools.nix @@ -148,9 +148,11 @@ let deployer.succeed("ln -sf ${pkgs.path} /nixpkgs") deployer.succeed("mkdir -p /root/.ssh && touch /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa && cat ${sshKeys.snakeOilPrivateKey} > /root/.ssh/id_rsa") + ${lib.optionalString (length targets != 0) '' for node in ${targetList}: node.wait_for_unit("sshd.service") deployer.succeed(f"ssh -o StrictHostKeyChecking=accept-new {node.name} true", timeout=30) + ''} deployer.succeed("cp --no-preserve=mode -r ${bundle} /tmp/bundle && chmod u+w /tmp/bundle")