Merge dleyna: 0.7.0 -> 0.8.3 (#400157)

Changed files
+101 -328
nixos
modules
pkgs
by-name
dl
dleyna
dleyna-connector-dbus
dleyna-core
dleyna-renderer
dleyna-server
gn
gnome-photos
gr
grilo-plugins
top-level
+1 -2
nixos/modules/module-list.nix
···
./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
-29
nixos/modules/services/desktops/dleyna-renderer.nix
···
-
# dleyna-renderer service.
-
{
-
config,
-
lib,
-
pkgs,
-
...
-
}:
-
{
-
###### interface
-
options = {
-
services.dleyna-renderer = {
-
enable = lib.mkOption {
-
type = lib.types.bool;
-
default = false;
-
description = ''
-
Whether to enable dleyna-renderer service, a DBus service
-
for handling DLNA renderers.
-
'';
-
};
-
};
-
};
-
-
###### implementation
-
config = lib.mkIf config.services.dleyna-renderer.enable {
-
environment.systemPackages = [ pkgs.dleyna-renderer ];
-
-
services.dbus.packages = [ pkgs.dleyna-renderer ];
-
};
-
}
-29
nixos/modules/services/desktops/dleyna-server.nix
···
-
# 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 ];
-
};
-
}
+33
nixos/modules/services/desktops/dleyna.nix
···
+
{
+
config,
+
lib,
+
pkgs,
+
...
+
}:
+
{
+
imports = [
+
(lib.mkRenamedOptionModule [ "services" "dleyna-server" ] [ "services" "dleyna" ])
+
(lib.mkRenamedOptionModule [ "services" "dleyna-renderer" ] [ "services" "dleyna" ])
+
];
+
+
###### interface
+
options = {
+
services.dleyna = {
+
enable = lib.mkOption {
+
type = lib.types.bool;
+
default = false;
+
description = ''
+
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.enable {
+
environment.systemPackages = [ pkgs.dleyna ];
+
+
services.dbus.packages = [ pkgs.dleyna ];
+
};
+
}
+1 -2
nixos/modules/services/x11/desktop-managers/budgie.nix
···
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;
+1 -2
nixos/modules/services/x11/desktop-managers/gnome.nix
···
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;
-53
pkgs/by-name/dl/dleyna-connector-dbus/package.nix
···
-
{
-
stdenv,
-
lib,
-
meson,
-
ninja,
-
pkg-config,
-
fetchFromGitHub,
-
fetchpatch,
-
dleyna-core,
-
glib,
-
}:
-
-
stdenv.mkDerivation rec {
-
pname = "dleyna-connector-dbus";
-
version = "0.4.1";
-
-
src = fetchFromGitHub {
-
owner = "phako";
-
repo = "dleyna-connector-dbus";
-
rev = "v${version}";
-
sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA=";
-
};
-
-
patches = [
-
# Fix build with meson 1.2. We use the gentoo patch instead of the
-
# usptream one because the latter only applies on the libsoup_3 based
-
# merged dLeyna project.
-
# https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6
-
(fetchpatch {
-
url = "https://github.com/gentoo/gentoo/raw/4a0982b49a1d94aa785b05d9b7d256c26c499910/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch";
-
sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI=";
-
})
-
];
-
-
nativeBuildInputs = [
-
meson
-
ninja
-
pkg-config
-
];
-
-
buildInputs = [
-
dleyna-core
-
glib
-
];
-
-
meta = with lib; {
-
description = "D-Bus API for the dLeyna services";
-
homepage = "https://github.com/phako/dleyna-connector-dbus";
-
maintainers = with maintainers; [ jtojnar ];
-
platforms = platforms.unix;
-
license = licenses.lgpl21Only;
-
};
-
}
-53
pkgs/by-name/dl/dleyna-core/package.nix
···
-
{
-
stdenv,
-
lib,
-
fetchFromGitHub,
-
meson,
-
ninja,
-
pkg-config,
-
gupnp,
-
}:
-
-
stdenv.mkDerivation rec {
-
pname = "dleyna-core";
-
version = "0.7.0";
-
-
outputs = [
-
"out"
-
"dev"
-
];
-
-
setupHook = ./setup-hook.sh;
-
-
src = fetchFromGitHub {
-
owner = "phako";
-
repo = "dleyna-core";
-
rev = "v${version}";
-
sha256 = "i4L9+iyAdBNtgImbD54jkjYL5hvzeZ2OaAyFrcFmuG0=";
-
};
-
-
nativeBuildInputs = [
-
meson
-
ninja
-
pkg-config
-
];
-
-
propagatedBuildInputs = [
-
gupnp
-
];
-
-
env.NIX_CFLAGS_COMPILE = toString (
-
lib.optionals stdenv.cc.isClang [
-
"-Wno-error=implicit-function-declaration"
-
"-Wno-error=int-conversion"
-
]
-
);
-
-
meta = with lib; {
-
description = "Library of utility functions that are used by the higher level dLeyna";
-
homepage = "https://github.com/phako/dleyna-core";
-
maintainers = with maintainers; [ jtojnar ];
-
platforms = platforms.unix;
-
license = licenses.lgpl21Only;
-
};
-
}
-8
pkgs/by-name/dl/dleyna-core/setup-hook.sh
···
-
addDleynaConnectorPath () {
-
if test -d "$1/lib/dleyna-1.0/connectors"
-
then
-
export DLEYNA_CONNECTOR_PATH="${DLEYNA_CONNECTOR_PATH-}${DLEYNA_CONNECTOR_PATH:+:}$1/lib/dleyna-1.0/connectors"
-
fi
-
}
-
-
addEnvHooks "$targetOffset" addDleynaConnectorPath
-76
pkgs/by-name/dl/dleyna-renderer/package.nix
···
-
{
-
stdenv,
-
lib,
-
fetchFromGitHub,
-
fetchpatch,
-
meson,
-
ninja,
-
pkg-config,
-
dleyna-connector-dbus,
-
dleyna-core,
-
gssdp,
-
gupnp,
-
gupnp-av,
-
gupnp-dlna,
-
libsoup_2_4,
-
makeWrapper,
-
docbook-xsl-nons,
-
libxslt,
-
}:
-
-
stdenv.mkDerivation rec {
-
pname = "dleyna-renderer";
-
version = "0.7.2";
-
-
src = fetchFromGitHub {
-
owner = "phako";
-
repo = "dleyna-renderer";
-
rev = "v${version}";
-
sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw=";
-
};
-
-
patches = [
-
# Fix build with meson 1.2. We use the gentoo patch instead of the
-
# usptream one because the latter only applies on the libsoup_3 based
-
# merged dLeyna project.
-
# https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6
-
(fetchpatch {
-
url = "https://github.com/gentoo/gentoo/raw/2ebe20ff4cda180cc248d31a021107d08ecf39d9/net-libs/dleyna-renderer/files/meson-1.2.0.patch";
-
sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI=";
-
})
-
];
-
-
nativeBuildInputs = [
-
meson
-
ninja
-
pkg-config
-
makeWrapper
-
-
# manpage
-
docbook-xsl-nons
-
libxslt # for xsltproc
-
];
-
-
buildInputs = [
-
dleyna-core
-
dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH
-
gssdp
-
gupnp
-
gupnp-av
-
gupnp-dlna
-
libsoup_2_4
-
];
-
-
preFixup = ''
-
wrapProgram "$out/libexec/dleyna-renderer-service" \
-
--set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH"
-
'';
-
-
meta = with lib; {
-
description = "Library to discover and manipulate Digital Media Renderers";
-
homepage = "https://github.com/phako/dleyna-renderer";
-
maintainers = with maintainers; [ jtojnar ];
-
platforms = platforms.unix;
-
license = licenses.lgpl21Only;
-
};
-
}
-70
pkgs/by-name/dl/dleyna-server/package.nix
···
-
{
-
stdenv,
-
lib,
-
fetchFromGitHub,
-
fetchpatch,
-
meson,
-
ninja,
-
makeWrapper,
-
pkg-config,
-
dleyna-core,
-
dleyna-connector-dbus,
-
gssdp,
-
gupnp,
-
gupnp-av,
-
gupnp-dlna,
-
libsoup_2_4,
-
}:
-
-
stdenv.mkDerivation rec {
-
pname = "dleyna-server";
-
version = "0.7.2";
-
-
src = fetchFromGitHub {
-
owner = "phako";
-
repo = pname;
-
rev = "v${version}";
-
sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME=";
-
};
-
-
patches = [
-
# Fix build with meson 1.2. We use the gentoo patch instead of the
-
# usptream one because the latter only applies on the libsoup_3 based
-
# merged dLeyna project.
-
# https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6
-
(fetchpatch {
-
url = "https://github.com/gentoo/gentoo/raw/2e3a1f4f7a1ef0c3e387389142785d98b5834e60/net-misc/dleyna-server/files/meson-1.2.0.patch";
-
sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI=";
-
})
-
];
-
-
nativeBuildInputs = [
-
meson
-
ninja
-
pkg-config
-
makeWrapper
-
];
-
-
buildInputs = [
-
dleyna-core
-
dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH
-
gssdp
-
gupnp
-
gupnp-av
-
gupnp-dlna
-
libsoup_2_4
-
];
-
-
preFixup = ''
-
wrapProgram "$out/libexec/dleyna-server-service" \
-
--set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH"
-
'';
-
-
meta = with lib; {
-
description = "Library to discover, browse and manipulate Digital Media Servers";
-
homepage = "https://github.com/phako/dleyna-server";
-
maintainers = with maintainers; [ jtojnar ];
-
platforms = platforms.unix;
-
license = licenses.lgpl21Only;
-
};
-
}
+57
pkgs/by-name/dl/dleyna/package.nix
···
+
{
+
stdenv,
+
lib,
+
docutils,
+
fetchFromGitLab,
+
meson,
+
ninja,
+
pkg-config,
+
gupnp_1_6,
+
gupnp-av,
+
gupnp-dlna,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "dleyna";
+
version = "0.8.3";
+
+
outputs = [
+
"out"
+
"dev"
+
];
+
+
src = fetchFromGitLab {
+
domain = "gitlab.gnome.org";
+
owner = "World";
+
repo = "dLeyna";
+
tag = "v${finalAttrs.version}";
+
hash = "sha256-ti4yF8sALpWyrdQTt/jVrMKQ4PLhakEi620fJNMxT0c=";
+
};
+
+
nativeBuildInputs = [
+
meson
+
ninja
+
docutils
+
pkg-config
+
];
+
+
buildInputs = [
+
gupnp_1_6
+
gupnp-dlna
+
gupnp-av
+
gupnp-dlna
+
];
+
+
mesonFlags = [
+
# Sphinx docs not installed, do not depend on sphinx
+
"-Ddocs=false"
+
];
+
+
meta = {
+
description = "Library of utility functions that are used by the higher level dLeyna";
+
homepage = "https://gitlab.gnome.org/World/dLeyna";
+
maintainers = with lib.maintainers; [ jtojnar ];
+
platforms = lib.platforms.unix;
+
license = lib.licenses.lgpl21Only;
+
};
+
})
+2 -2
pkgs/by-name/gn/gnome-photos/package.nix
···
babl,
dbus,
desktop-file-utils,
-
dleyna-renderer,
+
dleyna,
gdk-pixbuf,
gegl,
geocode-glib_2,
···
buildInputs = [
babl
dbus
-
dleyna-renderer
+
dleyna
gdk-pixbuf
gegl
geocode-glib_2
+2 -2
pkgs/by-name/gr/grilo-plugins/package.nix
···
json-glib,
avahi,
tinysparql,
-
dleyna-server,
+
dleyna,
itstool,
totem-pl-parser,
}:
···
avahi
libmediaart
tinysparql
-
dleyna-server
+
dleyna
gst_all_1.gstreamer
];
+4
pkgs/top-level/aliases.nix
···
dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07
diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25
+
dleyna-core = dleyna; # Added 2025-04-19
+
dleyna-connector-dbus = dleyna; # Added 2025-04-19
+
dleyna-renderer = dleyna; # Added 2025-04-19
+
dleyna-server = dleyna; # Added 2025-04-19
dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17
dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02