Unverified Commit 7a94322e authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #182618: GNOME 42 → 43

parents d6185309 81e445e5

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,13 @@ 
      has the following highlights:

    </para>

    <itemizedlist>

      <listitem>

        <para>

          GNOME has been upgraded to 43. Please take a look at their

          <link xlink:href="https://release.gnome.org/43/">Release

          Notes</link> for details.

        </para>

      </listitem>

      <listitem>

        <para>

          During cross-compilation, tests are now executed if the test

nixos/doc/manual/release-notes/rl-2211.section.md

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ Support is planned until the end of June 2023, handing over to 23.05. 


In addition to numerous new and upgraded packages, this release has the following highlights:



- GNOME has been upgraded to 43. Please take a look at their [Release

  Notes](https://release.gnome.org/43/) for details.



- During cross-compilation, tests are now executed if the test suite can be executed

  by the build platform. This is the case when doing “native” cross-compilation

  where the build and host platforms are largely the same, but the nixpkgs' cross

nixos/modules/module-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -391,9 +391,9 @@ 
  ./services/desktops/pipewire/pipewire-media-session.nix

  ./services/desktops/pipewire/wireplumber.nix

  ./services/desktops/gnome/at-spi2-core.nix

  ./services/desktops/gnome/chrome-gnome-shell.nix

  ./services/desktops/gnome/evolution-data-server.nix

  ./services/desktops/gnome/glib-networking.nix

  ./services/desktops/gnome/gnome-browser-connector.nix

  ./services/desktops/gnome/gnome-initial-setup.nix

  ./services/desktops/gnome/gnome-keyring.nix

  ./services/desktops/gnome/gnome-online-accounts.nix

nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix→nixos/modules/services/desktops/gnome/gnome-browser-connector.nix

+47 −0
Original line number Diff line number Diff line 
# Chrome GNOME Shell native host connector.

{ config, lib, pkgs, ... }:



with lib;

let

  inherit (lib) mdDoc mkEnableOption mkIf mkRenamedOptionModule teams;

in



{

  meta = {

    maintainers = teams.gnome.members;

  };



  # Added 2021-05-07

  imports = [

    # Added 2021-05-07

    (mkRenamedOptionModule

      [ "services" "gnome3" "chrome-gnome-shell" "enable" ]

      [ "services" "gnome" "gnome-browser-connector" "enable" ]

    )

    # Added 2022-07-25

    (mkRenamedOptionModule

      [ "services" "gnome" "chrome-gnome-shell" "enable" ]

      [ "services" "gnome" "gnome-browser-connector" "enable" ]

    )

  ];



  ###### interface

  options = {

    services.gnome.chrome-gnome-shell.enable = mkEnableOption (lib.mdDoc ''

      Chrome GNOME Shell native host connector, a DBus service

    services.gnome.gnome-browser-connector.enable = mkEnableOption (mdDoc ''

      Native host connector for the GNOME Shell browser extension, a DBus service

      allowing to install GNOME Shell extensions from a web browser.

    '');

  };





  ###### implementation

  config = mkIf config.services.gnome.chrome-gnome-shell.enable {

  config = mkIf config.services.gnome.gnome-browser-connector.enable {

    environment.etc = {

      "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";

      "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";

      "chromium/native-messaging-hosts/org.gnome.browser_connector.json".source = "${pkgs.gnome-browser-connector}/etc/chromium/native-messaging-hosts/org.gnome.browser_connector.json";

      "opt/chrome/native-messaging-hosts/org.gnome.browser_connector.json".source = "${pkgs.gnome-browser-connector}/etc/opt/chrome/native-messaging-hosts/org.gnome.browser_connector.json";

      # Legacy paths.

      "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.gnome-browser-connector}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";

      "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.gnome-browser-connector}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";

    };



    environment.systemPackages = [ pkgs.chrome-gnome-shell ];

    environment.systemPackages = [ pkgs.gnome-browser-connector ];



    services.dbus.packages = [ pkgs.chrome-gnome-shell ];

    services.dbus.packages = [ pkgs.gnome-browser-connector ];



    nixpkgs.config.firefox.enableGnomeExtensions = true;

  };

nixos/modules/services/x11/desktop-managers/gnome.nix

+2 −2
Original line number Diff line number Diff line
@@ -389,8 +389,8 @@ in 
        ++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages;



      services.colord.enable = mkDefault true;

      services.gnome.chrome-gnome-shell.enable = mkDefault true;

      services.gnome.glib-networking.enable = true;

      services.gnome.gnome-browser-connector.enable = mkDefault true;

      services.gnome.gnome-initial-setup.enable = mkDefault true;

      services.gnome.gnome-remote-desktop.enable = mkDefault true;

      services.gnome.gnome-settings-daemon.enable = true;
@@ -520,7 +520,7 @@ in 


      # Let nautilus find extensions

      # TODO: Create nautilus-with-extensions package

      environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";

      environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-4";



      # Override default mimeapps for nautilus

      environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];