Unverified Commit da862760 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge dleyna: 0.7.0 -> 0.8.3 (#400157)

parents 6d9f80d7 e3aa1e00

nixos/modules/module-list.nix

+1 −2
Original line number Diff line number Diff line
@@ -536,8 +536,7 @@ 
  ./services/desktops/deepin/dde-api.nix

  ./services/desktops/deepin/app-services.nix

  ./services/desktops/deepin/dde-daemon.nix

  ./services/desktops/dleyna-renderer.nix

  ./services/desktops/dleyna-server.nix

  ./services/desktops/dleyna.nix

  ./services/desktops/espanso.nix

  ./services/desktops/flatpak.nix

  ./services/desktops/geoclue2.nix

nixos/modules/services/desktops/dleyna-server.nix

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
# dleyna-server service.

{

  config,

  lib,

  pkgs,

  ...

}:

{

  ###### interface

  options = {

    services.dleyna-server = {

      enable = lib.mkOption {

        type = lib.types.bool;

        default = false;

        description = ''

          Whether to enable dleyna-server service, a DBus service

          for handling DLNA servers.

        '';

      };

    };

  };



  ###### implementation

  config = lib.mkIf config.services.dleyna-server.enable {

    environment.systemPackages = [ pkgs.dleyna-server ];



    services.dbus.packages = [ pkgs.dleyna-server ];

  };

}

nixos/modules/services/desktops/dleyna-renderer.nix→nixos/modules/services/desktops/dleyna.nix

+33 −0
Original line number Diff line number Diff line 
# dleyna-renderer service.

{

  config,

  lib,
@@ -6,24 +5,29 @@ 
  ...

}:

{

  imports = [

    (lib.mkRenamedOptionModule [ "services" "dleyna-server" ] [ "services" "dleyna" ])

    (lib.mkRenamedOptionModule [ "services" "dleyna-renderer" ] [ "services" "dleyna" ])

  ];



  ###### interface

  options = {

    services.dleyna-renderer = {

    services.dleyna = {

      enable = lib.mkOption {

        type = lib.types.bool;

        default = false;

        description = ''

          Whether to enable dleyna-renderer service, a DBus service

          for handling DLNA renderers.

          Whether to enable dleyna-renderer and dleyna-server service,

          a DBus service for handling DLNA servers and renderers.

        '';

      };

    };

  };



  ###### implementation

  config = lib.mkIf config.services.dleyna-renderer.enable {

    environment.systemPackages = [ pkgs.dleyna-renderer ];

  config = lib.mkIf config.services.dleyna.enable {

    environment.systemPackages = [ pkgs.dleyna ];



    services.dbus.packages = [ pkgs.dleyna-renderer ];

    services.dbus.packages = [ pkgs.dleyna ];

  };

}

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

+1 −2
Original line number Diff line number Diff line
@@ -245,8 +245,7 @@ in 
    services.system-config-printer.enable = config.services.printing.enable;



    # For BCC's Sharing panel.

    services.dleyna-renderer.enable = mkDefault true;

    services.dleyna-server.enable = mkDefault true;

    services.dleyna.enable = mkDefault true;

    services.gnome.gnome-user-share.enable = mkDefault true;

    services.gnome.rygel.enable = mkDefault true;

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

+1 −2
Original line number Diff line number Diff line
@@ -282,8 +282,7 @@ in 
      programs.dconf.enable = true;

      security.polkit.enable = true;

      services.accounts-daemon.enable = true;

      services.dleyna-renderer.enable = mkDefault true;

      services.dleyna-server.enable = mkDefault true;

      services.dleyna.enable = mkDefault true;

      services.power-profiles-daemon.enable = mkDefault true;

      services.gnome.at-spi2-core.enable = true;

      services.gnome.evolution-data-server.enable = true;