commit e4789ca32a9cfed76b6d2713cafae0f4c0023bef · pyrox.dev/nixpkgs

+14 -1

nixos/tests/drawterm.nix

···

       38
       38
        
               def drawterm_running():

     

       39
       39
        
                   machine.succeed("pgrep drawterm")

     

       40
       40
        
       

     

       41
       41
       +
               # cage is a bit wonky here.

     

       42
       42
       +
               # it seems to lag behind drawing

     

       43
       43
       +
               # and somehow needs a single input character

     

       44
       44
       +
               # in order to get the first prompt to show up.

     

       45
       45
       +
               # This is not present in any other compositor

     

       46
       46
       +
               # as far as I know, and after spending a couple

     

       47
       47
       +
               # hours with the upstream source trying to deduce

     

       48
       48
       +
               # how to perhaps fix it, I figured just polling is OK.

     

       49
       49
       +
               @polling_condition

     

       50
       50
       +
               def cpu_shown_up():

     

       51
       51
       +
                   machine.send_chars(".")

     

       52
       52
       +
                   machine.wait_for_text("cpu", 1)

     

       53
       53
       +
       

     

       41
       54
        
               start_all()

     

       42
       55
        
       

     

       43
       56
        
               machine.wait_for_unit("graphical.target")

     

       44
       57
        
               drawterm_running.wait() # type: ignore[union-attr]

     

       45
       45
       -
               machine.wait_for_text("cpu")

     

       58
       58
       +
               cpu_shown_up.wait() # type: ignore[union-attr]

     

       46
       59
        
               machine.send_chars("cpu\n")

     

       47
       60
        
               machine.wait_for_text("auth")

     

       48
       61
        
               machine.send_chars("cpu\n")

+3 -3

pkgs/tools/admin/drawterm/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation {

     

       21
       21
        
         pname = "drawterm";

     

       22
       22
       -
         version = "unstable-2024-02-18";

     

       22
       22
       +
         version = "unstable-2024-03-20";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFrom9Front {

     

       25
       25
        
           owner = "plan9front";

     

       26
       26
        
           repo = "drawterm";

     

       27
       27
       -
           rev = "bcf1eb425dd4c90a3bfcd004f6aee3854259da78";

     

       28
       28
       -
           hash = "sha256-aUQ6ay2ky9NzVUZvWyHc/GqPlCdhGpXTY8GGytJSC6g=";

     

       27
       27
       +
           rev = "77b464a5d5648bb646467111b8faf719cd5c46b6";

     

       28
       28
       +
           hash = "sha256-3J/Fa3NXxUieEqRcCepGdd0ktxQFKhyY4z8Pvcq94Kw=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         enableParallelBuilding = true;