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

lomiri.morph-browser: Drop (#505387)

parents ce729dcb 1666b4b5

nixos/tests/morph-browser.nix

+4 −3
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ let 
    }:

    makeTest (

      { pkgs, lib, ... }:

      assert lib.assertMsg withQt6 "`lomiri.morph-browser` has been dropped, cannot test it.";

      {

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

        name = "morph-browser-qt6-standalone";

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



        nodes.machine =
@@ -24,7 +25,7 @@ let 
            services.xserver.enable = true;



            environment = {

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

              systemPackages = with pkgs.lomiri-qt6; [

                suru-icon-theme

                morph-browser

              ];
@@ -76,6 +77,6 @@ let 
    );

in

{

  qt5 = generic { withQt6 = false; };

  qt5 = throw "`lomiri.morph-browser` has been removed because it relied on the known-vulnerable `libsForQt5.qtwebengine`. For testing the Qt6 version of Morph, please use `nixosTests.morph-browser.qt6` instead."; # Added on 2026-03-31

  qt6 = generic { withQt6 = true; };

}

pkgs/desktops/lomiri/applications/morph-browser/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -159,11 +159,12 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru = {

    updateScript = gitUpdater { };

  }

  // lib.optionalAttrs withQt6 {

    tests = {

      # Test of morph-browser itself

      standalone = if withQt6 then nixosTests.morph-browser.qt6 else nixosTests.morph-browser.qt5;

    }

    // lib.optionalAttrs withQt6 {



      # Interactions between the Lomiri ecosystem and this browser

      inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions;

    };

pkgs/desktops/lomiri/default.nix

+8 −6
Original line number Diff line number Diff line
@@ -16,12 +16,6 @@ let 
      inherit (self) callPackage;

    in

    {

      #### Core Apps

      morph-browser = callPackage ./applications/morph-browser {

        # get_target_property() called with non-existent target "Qt6::qdoc".

        withDocumentation = !useQt6;

      };



      #### Data

      lomiri-schemas = callPackage ./data/lomiri-schemas { };

      lomiri-sounds = callPackage ./data/lomiri-sounds { };
@@ -56,6 +50,13 @@ let 
      lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };

      lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };

    }

    // lib.optionalAttrs useQt6 {

      #### Core Apps

      morph-browser = callPackage ./applications/morph-browser {

        # get_target_property() called with non-existent target "Qt6::qdoc".

        withDocumentation = !useQt6;

      };

    }

    // lib.optionalAttrs (!useQt6) {

      #### Core Apps

      lomiri = callPackage ./applications/lomiri { };
@@ -105,5 +106,6 @@ lib.makeScope qtPackages.newScope packages 
  content-hub = lib.warnOnInstantiate "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11

  history-service = lib.warnOnInstantiate "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11

  lomiri-system-settings-security-privacy = lib.warnOnInstantiate "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08

  morph-browser = throw "`lomiri.morph-browser` has been removed because it relied on the known-vulnerable `libsForQt5.qtwebengine`. Please use `lomiri-qt6.morph-browser` instead."; # Added on 2026-03-31

  telephony-service = lib.warnOnInstantiate "`telephony-service` was renamed to `lomiri-telephony-service`." pkgs.lomiri.lomiri-telephony-service; # Adder on 2025-01-15

}