Merge pull request #761 from nix-community/update_flake_lock_action

flake.lock: Update

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725194671,
-        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
+        "lastModified": 1730958623,
+        "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
+        "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
         "type": "github"
       },
       "original": {

lib/tests.nix

@@ -54,6 +54,7 @@ let
       , postDisko ? ""
       , testMode ? "module" # can be one of direct module cli
       , testBoot ? true # if we actually want to test booting or just create/mount
+      , enableOCR ? false
       }:
       let
         makeTest' = args:
@@ -163,6 +164,8 @@ let
       in
       makeTest' {
         name = "disko-${name}";
+        meta.timeout = 600; # 10 minutes
+        inherit enableOCR;
 
         nodes.machine = { pkgs, ... }: {
           imports = [

tests/luks-interactive-login.nix

@@ -1,15 +1,17 @@
-{ pkgs ? import <nixpkgs> { }
-, diskoLib ? pkgs.callPackage ../lib { }
+{
+  pkgs ? import <nixpkgs> { },
+  diskoLib ? pkgs.callPackage ../lib { },
 }:
 diskoLib.testLib.makeDiskoTest {
   inherit pkgs;
   name = "luks-interactive-login";
   disko-config = ../example/luks-interactive-login.nix;
+  enableOCR = true;
   extraTestScript = ''
     machine.succeed("cryptsetup isLuks /dev/vda2");
   '';
   bootCommands = ''
-    machine.wait_for_console_text("vda")
-    machine.send_console("secretsecret\n")
+    machine.wait_for_text("[Pp]assphrase for")
+    machine.send_chars("secretsecret\n")
   '';
 }