Unverified Commit cba18234 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

lomiri-qt6: init (#467662)

parents 45c7749b b5e4eb83

nixos/modules/services/desktop-managers/lomiri.nix

+4 −4
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ in 
            libayatana-common

            ubports-click

          ])

          # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067

          ++ (with pkgs.lomiri-qt6; [

            morph-browser

          ])

          ++ (with pkgs.lomiri; [

            hfd-service

            libusermetrics
@@ -125,10 +129,6 @@ in 
            lomiri-thumbnailer

            lomiri-url-dispatcher

            mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target

            # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067

            # morph-browser

            # Adding another browser that is known-working until Morph Browser can migrate to Qt6

            pkgs.epiphany

            qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session

            teleports

          ]);

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ in 
  moonraker = runTest ./moonraker.nix;

  moosefs = runTest ./moosefs.nix;

  mopidy = runTest ./mopidy.nix;

  morph-browser = runTest ./morph-browser.nix;

  morph-browser = discoverTests (import ./morph-browser.nix);

  mosquitto = runTest ./mosquitto.nix;

  movim = import ./web-apps/movim {

    inherit runTest;

nixos/tests/lomiri.nix

+10 −11
Original line number Diff line number Diff line
@@ -507,16 +507,15 @@ in 
              machine.send_key("alt-f4")



          # Morph is how we go online

          # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067

          # with subtest("morph browser works"):

          #     open_starter()

          #     machine.send_chars("Morph\n")

          #     wait_for_text(r"(Bookmarks|address|site|visited any)")

          #     machine.screenshot("morph_open")

          #

          #     # morph-browser has a separate VM test to test its basic functionalities

          #

          #     machine.send_key("alt-f4")

          with subtest("morph browser works"):

              open_starter()

              machine.send_chars("Morph\n")

              wait_for_text(r"(Bookmarks|address|site|visited any)")

              machine.screenshot("morph_open")



              # morph-browser has a separate VM test to test its basic functionalities



              machine.send_key("alt-f4")



          # LSS provides DE settings

          with subtest("system settings open"):
@@ -689,7 +688,7 @@ in 
              machine.screenshot("settings_lomiri-content-hub_peers")



              # Select Gallery as content source

              mouse_click(460, 80)

              mouse_click(540, 80)



              # Expect Gallery to be brought into the foreground, with its sharing page open

              wait_for_text("Photos")

nixos/tests/morph-browser.nix

+68 −51
Original line number Diff line number Diff line 
let

  makeTest = import ./make-test-python.nix;

  generic =

    {

      withQt6,

    }:

    makeTest (

      { pkgs, lib, ... }:

      {

  name = "morph-browser-standalone";

        name = "morph-browser-${if withQt6 then "qt6" else "qt5"}-standalone";

        meta.maintainers = lib.teams.lomiri.members;



        nodes.machine =

    { config, pkgs, ... }:

          {

            config,

            pkgs,

            ...

          }:

          {

            imports = [

              ./common/x11.nix
@@ -13,7 +24,7 @@ 
            services.xserver.enable = true;



            environment = {

        systemPackages = with pkgs.lomiri; [

              systemPackages = with (if withQt6 then pkgs.lomiri-qt6 else pkgs.lomiri); [

                suru-icon-theme

                morph-browser

              ];
@@ -62,3 +73,9 @@ 
              machine.screenshot("morph_localised")

        '';

      }

    );

in

{

  qt5 = generic { withQt6 = false; };

  qt6 = generic { withQt6 = true; };

}

pkgs/by-name/ay/ayatana-indicator-display/package.nix

+2 −4
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
  intltool,

  libayatana-common,

  libgudev,

  libqtdbusmock,

  libqtdbustest,

  librda,

  libsForQt5,

  lomiri,
@@ -91,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: { 


  checkInputs = [

    gtest

    libqtdbusmock

    libqtdbustest

    libsForQt5.libqtdbusmock

    libsForQt5.libqtdbustest

    properties-cpp

  ];