Skip to content

dleyna: 0.7.0 -> 0.8.3#400157

Merged
jtojnar merged 6 commits intoNixOS:masterfrom
LordGrimmauld:dleyna-up
Apr 23, 2025
Merged

dleyna: 0.7.0 -> 0.8.3#400157
jtojnar merged 6 commits intoNixOS:masterfrom
LordGrimmauld:dleyna-up

Conversation

@LordGrimmauld
Copy link
Contributor

@LordGrimmauld LordGrimmauld commented Apr 19, 2025

dleyna moved from github to https://gitlab.gnome.org/World/dLeyna.

Most importantly, the project has been unified into one repository and one meson build. This means the package no longer needs to be split apart. Similar is valid for the dbus service and therefore nixos modules.

To not break things that depend on dleyna outside nixpkgs, i added aliases to the old (split) names, these all point to the same (unified) dleyna package.

Closes #399076
Part of #360897

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 19, 2025
@LordGrimmauld LordGrimmauld force-pushed the dleyna-up branch 3 times, most recently from cfd9267 to fdec92d Compare April 19, 2025 19:47
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 19, 2025
@grimmauld-bot
Copy link

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 400157


aarch64-linux

⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
✅ 12 packages built:
  • budgie-control-center
  • budgie-control-center.debug
  • cheese
  • cheese.devdoc
  • cheese.man
  • dleyna
  • dleyna.dev
  • gnome-music
  • gnome-photos
  • gnome-photos.installedTests
  • grilo-plugins
  • totem

@LordGrimmauld
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 400157


x86_64-linux

⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
✅ 12 packages built:
  • budgie-control-center
  • budgie-control-center.debug
  • cheese
  • cheese.devdoc
  • cheese.man
  • dleyna
  • dleyna.dev
  • gnome-music
  • gnome-photos
  • gnome-photos.installedTests
  • grilo-plugins
  • totem

@LordGrimmauld
Copy link
Contributor Author

LordGrimmauld commented Apr 19, 2025

I tried listing dbus services in a gnome VM with:

$ dbus-send --system --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.ListNames
$ dbus-send --session --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.ListNames

However, neither before nor after my updates did this list anything dylena-related. What am i doing wrong?
Nvm, found my error!

@LordGrimmauld
Copy link
Contributor Author

image
judging by journal logs, the dbus service is being picked up correctly.

Copy link
Contributor

@nyabinary nyabinary left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:p

@0xda157
Copy link
Contributor

0xda157 commented Apr 20, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 400157


x86_64-linux

⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
✅ 12 packages built:
  • budgie-control-center
  • budgie-control-center.debug
  • cheese
  • cheese.devdoc
  • cheese.man
  • dleyna
  • dleyna.dev
  • gnome-music
  • gnome-photos
  • gnome-photos.installedTests
  • grilo-plugins
  • totem

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 20, 2025
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much for tackling this. This has been on my to-do list for years.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All three components have Requires: gupnp-1.2 >= 1.2.0, glib-2.0 >= 2.28 in the pkg-config files. So they should be still propagated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait why would this need to propagate? previously, -core propagated because it was needed for renderer/server. However, now that it is all combined and built all at once, i don't see the need for the propagation anymore

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All dependencies transitively listed in Requires field of a .pc file need to be on PKG_CONFIG_PATH or for the dependency defined by that .pc file to be found.

We typically add them to propagatedBuildInputs so that we do not need to add those transitive dependencies to buildInputs each dependent of the .pc file.

Though it looks like there are no dependents for the dleyna .pc files so perhaps the point is moot:

https://codesearch.debian.net/search?q=dleyna-core-1.0&literal=1
https://codesearch.debian.net/search?q=dleyna-renderer-service-1.0&literal=1
https://codesearch.debian.net/search?q=dleyna-server-service-1.0&literal=1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently there is not even a .pc file being installed - is that a problem?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried testing it but so far I did not even manage to make it work in other applications.

  • I set up minidlnad (with videos, audio and pictures) on my router and verified that it works on VLC on Android.
  • Opened firewall ports on my desktop, not sure if necessary or complete: sudo nixos-firewall-tool open tcp 2869 and sudo nixos-firewall-tool open udp 1900
  • In VLC on Desktop, open View » Playlist, check that the server is listed in Universal Plug'n'Play: The tab is empty
  • ${gupnp-tools}/bin/gssdp-discover --interface=wlp3s0 does not show any available messages.
  • Kill running dleyna processes if present, run ${dleyna}/libexec/dleyna-renderer-service to let the new version bind to D-Bus address.
  • Add grilo-plugins to buildInputs of rhythmbox, enable "Grilo media browser" plug-in: Nothing listed
  • In GNOME Music, nothing listed.
  • In GNOME Photos nothing is listed.
  • In Totem, I get ton of grl_source_resolve: assertion 'GRL_IS_SOURCE (source)' failed criticals but same on master.
  • ${gssdp-tools}/bin/gssdp-device-sniffer --interface=wlp3s0 does not show anything.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh oh - I was happy to see it listed in journal, but seems i have some work to do!

Copy link
Member

@jtojnar jtojnar Apr 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just wanted to check that it still works (I last tested it ages ago) but did not even get it to work on nixos-unstable. The whole DLNA/UPNP ecosystem has always been extremely flaky in my experience (slow ARM devices taking tens of seconds for every request, often timing out or otherwise failing because the implementation is broken).

I just gotten VLC on my desktop PC to discover the DLNA server and play the files once but after restarting VLC, I cannot get it to work again.

So I would probably not spend too much time on it. Especially when of the four apps (Totem, GNOME Photos, GNOME Music currently filtered out, Rhythmbox), only the last one is somewhat maintained and the package does not even include the necessary grilo-plugins.

Edit: There is also pragha but there, the grilo-plugins are disabled by default.

@LordGrimmauld LordGrimmauld marked this pull request as draft April 21, 2025 10:28
@LordGrimmauld
Copy link
Contributor Author

Currently working on fixing up #400430, then i'll take a look here. Thanks for the detailed review though :)

@LordGrimmauld LordGrimmauld marked this pull request as ready for review April 21, 2025 16:12
@wegank wegank added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Apr 22, 2025
@jtojnar jtojnar merged commit da86276 into NixOS:master Apr 23, 2025
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update Request: dleyna-* 0.7.x → 0.8.3

7 participants