commit 14b04af9f4776ffd94078a320ba7b68748586f0f · pyrox.dev/nixpkgs

+24 -2

nixos/tests/miracle-wm.nix

···

       22
       22
        
               user = "alice";

     

       23
       23
        
             };

     

       24
       24
        
       

     

       25
       25
       +
             programs.ydotool.enable = true;

     

       26
       26
       +
       

     

       25
       27
        
             services.xserver.enable = true;

     

       26
       28
        
             services.displayManager.defaultSession = lib.mkForce "miracle-wm";

     

       27
       29
        
       

     
···

       59
       61
        
               ];

     

       60
       62
        
       

     

       61
       63
        
               # To help with OCR

     

       62
       62
       -
               etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {

     

       64
       64
       +
               etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" {

     

       63
       65
        
                 main = {

     

       64
       66
        
                   font = "inconsolata:size=16";

     

       65
       67
        
                 };

     
···

       69
       71
        
                   regular2 = foreground;

     

       70
       72
        
                 };

     

       71
       73
        
               };

     

       72
       72
       -
               etc."xdg/alacritty/alacritty.yml".text = lib.generators.toYAML { } {

     

       74
       74
       +
               etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" {

     

       73
       75
        
                 font = rec {

     

       74
       76
        
                   normal.family = "Inconsolata";

     

       75
       77
        
                   bold.family = normal.family;

     
···

       114
       116
        
                 machine.wait_for_file("/tmp/test-wayland-exit-ok")

     

       115
       117
        
                 machine.copy_from_vm("/tmp/test-wayland.out")

     

       116
       118
        
                 machine.screenshot("foot_wayland_info")

     

       119
       119
       +
       

     

       120
       120
       +
                 # please actually register that we want to close the window

     

       121
       121
       +
                 machine.succeed("ydotool mousemove -- 10 10")

     

       122
       122
       +
                 machine.sleep(3)

     

       123
       123
       +
       

     

       117
       124
        
                 machine.send_chars("exit\n")

     

       125
       125
       +
       

     

       126
       126
       +
                 # please actually register that we want to close the window

     

       127
       127
       +
                 machine.succeed("ydotool mousemove -- 10 10")

     

       128
       128
       +
                 machine.sleep(3)

     

       129
       129
       +
       

     

       118
       130
        
                 machine.wait_until_fails("pgrep foot")

     

       119
       131
        
       

     

       120
       132
        
             # Test XWayland

     
···

       125
       137
        
                 machine.wait_for_file("/tmp/test-x11-exit-ok")

     

       126
       138
        
                 machine.copy_from_vm("/tmp/test-x11.out")

     

       127
       139
        
                 machine.screenshot("alacritty_glinfo")

     

       140
       140
       +
       

     

       141
       141
       +
                 # please actually register that we want to close the window

     

       142
       142
       +
                 machine.succeed("ydotool mousemove -- 10 10")

     

       143
       143
       +
                 machine.sleep(3)

     

       144
       144
       +
       

     

       128
       145
        
                 machine.send_chars("exit\n")

     

       146
       146
       +
       

     

       147
       147
       +
                 # please actually register that we want to close the window

     

       148
       148
       +
                 machine.succeed("ydotool mousemove -- 10 10")

     

       149
       149
       +
                 machine.sleep(3)

     

       150
       150
       +
       

     

       129
       151
        
                 machine.wait_until_fails("pgrep alacritty")

     

       130
       152
        
           '';

     

       131
       153
        
       }

+28 -10

nixos/tests/miriway.nix

···

       23
       23
        
                 user = "alice";

     

       24
       24
        
               };

     

       25
       25
        
       

     

       26
       26
       +
               programs.ydotool.enable = true;

     

       27
       27
       +
       

     

       26
       28
        
               services.xserver.enable = true;

     

       27
       29
        
               services.displayManager.defaultSession = lib.mkForce "miriway";

     

       28
       30
        
       

     
···

       55
       57
        
                 ];

     

       56
       58
        
       

     

       57
       59
        
                 # To help with OCR

     

       58
       58
       -
                 etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {

     

       60
       60
       +
                 etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" {

     

       59
       61
        
                   main = {

     

       60
       62
        
                     font = "inconsolata:size=16";

     

       61
       63
        
                   };

     
···

       65
       67
        
                     regular2 = foreground;

     

       66
       68
        
                   };

     

       67
       69
        
                 };

     

       68
       68
       -
                 etc."xdg/alacritty/alacritty.yml".text = lib.generators.toYAML { } {

     

       70
       70
       +
                 etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" {

     

       69
       71
        
                   font = rec {

     

       70
       72
        
                     normal.family = "Inconsolata";

     

       71
       73
        
                     bold.family = normal.family;

     
···

       109
       111
        
               machine.wait_for_file("/tmp/test-wayland-exit-ok")

     

       110
       112
        
               machine.copy_from_vm("/tmp/test-wayland.out")

     

       111
       113
        
               machine.screenshot("foot_wayland_info")

     

       112
       112
       -
               # Only succeeds when a mouse is moved inside an interactive session?

     

       113
       113
       -
               # machine.send_chars("exit\n")

     

       114
       114
       -
               # machine.wait_until_fails("pgrep foot")

     

       115
       115
       -
               machine.succeed("pkill foot")

     

       114
       114
       +
       

     

       115
       115
       +
               # please actually register that we want to close the window

     

       116
       116
       +
               machine.succeed("ydotool mousemove -- 10 10")

     

       117
       117
       +
               machine.sleep(3)

     

       118
       118
       +
       

     

       119
       119
       +
               machine.send_chars("exit\n")

     

       120
       120
       +
       

     

       121
       121
       +
               # please actually register that we want to close the window

     

       122
       122
       +
               machine.succeed("ydotool mousemove -- 10 10")

     

       123
       123
       +
               machine.sleep(3)

     

       124
       124
       +
       

     

       125
       125
       +
               machine.wait_until_fails("pgrep foot")

     

       116
       126
        
       

     

       117
       127
        
               # Test XWayland

     

       118
       128
        
               machine.send_key("ctrl-alt-a")

     
···

       121
       131
        
               machine.wait_for_file("/tmp/test-x11-exit-ok")

     

       122
       132
        
               machine.copy_from_vm("/tmp/test-x11.out")

     

       123
       133
        
               machine.screenshot("alacritty_glinfo")

     

       124
       124
       -
               # Only succeeds when a mouse is moved inside an interactive session?

     

       125
       125
       -
               # machine.send_chars("exit\n")

     

       126
       126
       -
               # machine.wait_until_fails("pgrep alacritty")

     

       127
       127
       -
               machine.succeed("pkill alacritty")

     

       134
       134
       +
       

     

       135
       135
       +
               # please actually register that we want to close the window

     

       136
       136
       +
               machine.succeed("ydotool mousemove -- 10 10")

     

       137
       137
       +
               machine.sleep(3)

     

       138
       138
       +
       

     

       139
       139
       +
               machine.send_chars("exit\n")

     

       140
       140
       +
       

     

       141
       141
       +
               # please actually register that we want to close the window

     

       142
       142
       +
               machine.succeed("ydotool mousemove -- 10 10")

     

       143
       143
       +
               machine.sleep(3)

     

       144
       144
       +
       

     

       145
       145
       +
               machine.wait_until_fails("pgrep alacritty")

     

       128
       146
        
             '';

     

       129
       147
        
         }

     

       130
       148
        
       )

+6 -3

pkgs/servers/mir/common.nix

···

       12
       12
        
         freetype,

     

       13
       13
        
         glib,

     

       14
       14
        
         glm,

     

       15
       15
       -
         glog,

     

       16
       15
        
         libapparmor,

     

       17
       16
        
         libdrm,

     

       18
       17
        
         libepoxy,

     
···

       112
       111
        
           freetype

     

       113
       112
        
           glib

     

       114
       113
        
           glm

     

       115
       115
       -
           glog

     

       116
       114
        
           libdrm

     

       117
       115
        
           libepoxy

     

       118
       116
        
           libevdev

     
···

       159
       157
        
           # BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such

     

       160
       158
        
           # https://github.com/canonical/mir/pull/1947#issuecomment-811810872

     

       161
       159
        
           (lib.cmakeBool "MIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN" true)

     

       162
       162
       -
           (lib.cmakeFeature "MIR_EXCLUDE_TESTS" (lib.strings.concatStringsSep ";" [ ]))

     

       160
       160
       +
           (lib.cmakeFeature "MIR_EXCLUDE_TESTS" (

     

       161
       161
       +
             lib.strings.concatStringsSep ";" [

     

       162
       162
       +
               # https://github.com/canonical/mir/issues/3716#issuecomment-2580698552

     

       163
       163
       +
               "UdevWrapperTest.UdevMonitorDoesNotTriggerBeforeEnabling"

     

       164
       164
       +
             ]

     

       165
       165
       +
           ))

     

       163
       166
        
           # These get built but don't get executed by default, yet they get installed when tests are enabled

     

       164
       167
        
           (lib.cmakeBool "MIR_BUILD_PERFORMANCE_TESTS" false)

     

       165
       168
        
           (lib.cmakeBool "MIR_BUILD_PLATFORM_TEST_HARNESS" false)

+35

pkgs/servers/mir/default.nix

···

       29
       29
        
               hash = "sha256-k+51piPQandbHdm+ioqpBrb+C7Aqi2kugchAehZ1aiU=";

     

       30
       30
        
             })

     

       31
       31
        
       

     

       32
       32
       +
             # Always depend on epoxy

     

       33
       33
       +
             # Remove when version > 2.15.0

     

       34
       34
       +
             (fetchpatch {

     

       35
       35
       +
               name = "0003-mir-cmake-always-require-epoxy.patch";

     

       36
       36
       +
               url = "https://github.com/canonical/mir/commit/171c42ac3929f946a70505ee42be0ce8220f245a.patch";

     

       37
       37
       +
               hash = "sha256-QuVZBcHSn/DK+xbjM36Y89+w22vk7NRV4MkbjgvS28A=";

     

       38
       38
       +
             })

     

       39
       39
       +
       

     

       32
       40
        
             # Fix ignored return value of std::lock_guard

     

       33
       41
        
             # Remove when version > 2.15.0

     

       34
       42
        
             # Was changed as part of the big platform API change, no individual upstream commit with this fix

     
···

       44
       52
        
             # Partially done in https://github.com/canonical/mir/pull/3192, though one of the calloc was fixed earlier

     

       45
       53
        
             # when some code was moved into that file

     

       46
       54
        
             ./1003-mir-2_15-calloc-args-in-right-order.patch

     

       55
       55
       +
       

     

       56
       56
       +
             # Drop gflags & glog dependencies

     

       57
       57
       +
             # Remove when version > 2.16.4

     

       58
       58
       +
             (fetchpatch {

     

       59
       59
       +
               name = "0101-Drop-unused-dependency-on-gflags.patch";

     

       60
       60
       +
               url = "https://github.com/canonical/mir/commit/15a40638e5e9c4b6a11b7fa446ad31e190f485e7.patch";

     

       61
       61
       +
               includes = [

     

       62
       62
       +
                 "CMakeLists.txt"

     

       63
       63
       +
                 "examples/mir_demo_server/CMakeLists.txt"

     

       64
       64
       +
                 "examples/mir_demo_server/glog_logger.cpp"

     

       65
       65
       +
               ];

     

       66
       66
       +
               hash = "sha256-qIsWCOs6Ap0jJ2cpgdO+xJHmSqC6zP+J3ALAfmlA6Vc=";

     

       67
       67
       +
             })

     

       68
       68
       +
             (fetchpatch {

     

       69
       69
       +
               name = "0102-Drop-the-glog-example.patch";

     

       70
       70
       +
               url = "https://github.com/canonical/mir/commit/8407da28ddb9a535df2775f224bf5143e8770d52.patch";

     

       71
       71
       +
               includes = [

     

       72
       72
       +
                 "CMakeLists.txt"

     

       73
       73
       +
                 "examples/mir_demo_server/CMakeLists.txt"

     

       74
       74
       +
                 "examples/mir_demo_server/glog_logger.cpp"

     

       75
       75
       +
                 "examples/mir_demo_server/glog_logger.h"

     

       76
       76
       +
                 "examples/mir_demo_server/server_example.cpp"

     

       77
       77
       +
                 "examples/mir_demo_server/server_example_log_options.cpp"

     

       78
       78
       +
                 "examples/mir_demo_server/server_example_log_options.h"

     

       79
       79
       +
               ];

     

       80
       80
       +
               hash = "sha256-jVhVR7wZZZGRS40z+HPNoGBLHulvE1nHRKgYhQ6/g9M=";

     

       81
       81
       +
             })

     

       47
       82
        
           ];

     

       48
       83
        
         };

     

       49
       84
        
       }