mpd: 0.20.13 -> 0.21.16 #57608

tobim · 2019-03-13T22:35:11Z

Motivation for this change

Things done

tobim · 2019-03-13T22:41:38Z

The first commit removes the xSupport flags from the parameter attribute set and puts the platform specific switches into a single place. The second does the actual update and switch to meson.

tobim · 2019-03-14T08:08:11Z

@GrahamcOfBorg build mpd

tobim · 2019-03-29T11:35:40Z

Added an alternative mpd-small attribute for users who want to avoid xorg dependencies.
Closure sizes are:

mpd: 352.5M
mpd-small: 60.9M

tobim · 2019-03-29T11:38:39Z

maintainer cc: @astsmtl @Fuuzetsu @ehmry @fpletz

immae · 2019-04-22T16:13:21Z

This derivation outputs a directory $(out)/etc/systemd as is (with $(out) not expanded), not critical bug but I think there is a typo somewhere :)

immae · 2019-04-22T16:31:31Z

I suggest this change about above issue and a new flag for better compatibility (I have no opinion whether syslog should be in the list of features or not, but it should definitely be supported)

118a119
>         ++ [ "-Dsyslog=enabled" ]
122c123
<           "-Dsystemd_system_unit_dir=$(out)/etc/systemd/system";
---
>           "-Dsystemd_system_unit_dir=etc/systemd/system";

Also, 0.21.7 is released now

tobim · 2019-05-12T22:40:55Z

Thanks, fixed the path and updated to 0.21.8.
I don't think syslog should be enabled, since the logs are ingested by jounald.

immae · 2019-05-12T22:50:53Z

@tobim: no, the choice is only between syslog and /var/log, so the feature should definitely be switchable in the configuration like the over features available in the derivation

immae · 2019-05-12T22:57:55Z

~~Sorry, I’ll rephrase: without "-Dsyslog=enabled" you can only store logs as a plain file. With the option enabled, you can chose between a file and syslog.~~
Nevermind, this changed in 0.21.3, now systemd is taken into account so this option isn’t needed.

Ekleog · 2019-06-15T23:37:08Z

@GrahamcOfBorg build mpd mpd-small nixosTests.mpd

Ekleog

This refactor looks pretty neat to me! A few comments below, though

pkgs/servers/mpd/default.nix

aanderse · 2019-07-14T10:32:18Z

@Ekleog ping (triage)

Ekleog · 2019-07-19T19:54:38Z

@aanderse I don't particularly know mpd (or even use it myself), just came across this PR while doing triage too. All the comments I could find have been addressed, but I don't feel ready to merge unless someone else reviews it, as it's a pretty big refactor of a derivation for a package I know basically nothing about :)

tobim · 2019-07-24T14:27:09Z

~~I'm not sure this refactor is still the right approach after the meson builder was changed to enable feature auto-detection. I think this can be simplified considerably now.~~
Nevermind, it seems the auto-detection is synonymous with enabling everything. It complains about missing dependencies.

tobim · 2019-07-25T19:52:50Z

Updated to 0.21.11 and rebased.

Also use pname instead of name.

- Expose run function as mpdWithFeatures. - Throw on invalid feature requests. - Drop major/minor version variables. - Cosmetic improvements.

fpletz

So I haven't commented so far because I'm not a big fan of changing these feature flags because it breaks peoples' nix expressions. It would be nice if there was a standard we would follow but currently there isn't.

Since you're obviously committed and keen on maintaining mpd - more so than the old maintainers - I see no real reason why we shouldn't merge this now. Thanks a lot for your work on this!

All comments were addressed.

arcnmx · 2019-11-13T15:40:46Z

It would be nice if there was a standard we would follow but currently there isn't.

As someone who is currently maintaining a branch/patchset that adds a feature to mpd, this would be nice, particularly if it also enabled some way to add to the list via overrides.

fpletz · 2019-11-13T15:46:55Z

Also fixed the mpd NixOS test (which was broken even before this PR): 4d9899e

* Refactor mpd * mpd: 0.20.13 -> 0.21.5 Switch to meson based build, following upstream. * Fix mpd on darwin * mpd: 0.21.5 -> 0.21.6 * mpd-small: init add 0.21.6 * Update to 0.21.8 & fix ouput path Also use pname instead of name. * Update to 0.21.9 * Integrate review suggestions - Expose run function as mpdWithFeatures. - Throw on invalid feature requests. - Drop major/minor version variables. - Cosmetic improvements. * Update to 0.21.10 * mpd: 0.21.10 -> 0.21.11 * mpd: 0.21.11 -> 0.21.12 * mpd: log to journal * mpd: 0.21.12 -> 0.21.14 * mpd: add tobim to maintainers * mpd: reenable syslog support * mpd: 0.21.14 -> 0.21.15 * mpd: 0.21.15 -> 0.21.16 (cherry picked from commit 4a9d549)

MPD is using syslog for its logging output, while it could directly log to systemd's journal, as this daemon is primarily used as a systemd user service. This change makes MPD log to standard output, which is captured by systemd. See NixOS/nixpkgs#57608, which does the same thing to NixOS's MPD service.

tobim force-pushed the mpd-0.21 branch from be55328 to a55ecab Compare March 13, 2019 22:46

GrahamcOfBorg added 8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Mar 13, 2019

GrahamcOfBorg added 10.rebuild-darwin: 1-10 and removed 10.rebuild-darwin: 0 labels Mar 14, 2019

tobim force-pushed the mpd-0.21 branch from f8fc4e5 to 3f4794c Compare March 29, 2019 11:24

tobim changed the title ~~mpd: 0.20.13 -> 0.21.5~~ mpd: 0.20.13 -> 0.21.6 Mar 29, 2019

GrahamcOfBorg added the 8.has: package (new) label Mar 29, 2019

tobim marked this pull request as ready for review March 29, 2019 11:35

tobim changed the title ~~mpd: 0.20.13 -> 0.21.6~~ mpd: 0.20.13 -> 0.21.8 May 12, 2019

tobim mentioned this pull request Jun 6, 2019

mpd: nixos module support for standard users #62771

Closed

10 tasks

Ekleog previously requested changes Jun 15, 2019

View reviewed changes

tobim changed the title ~~mpd: 0.20.13 -> 0.21.8~~ mpd: 0.20.13 -> 0.21.10 Jun 16, 2019

tobim force-pushed the mpd-0.21 branch from 77760c9 to 2187843 Compare July 25, 2019 19:52

tobim changed the title ~~mpd: 0.20.13 -> 0.21.10~~ mpd: 0.20.13 -> 0.21.11 Jul 25, 2019

tobim added 12 commits November 10, 2019 09:23

Update to 0.21.8 & fix ouput path

e2fae34

Also use pname instead of name.

Update to 0.21.9

034ed38

Integrate review suggestions

e5ee533

- Expose run function as mpdWithFeatures. - Throw on invalid feature requests. - Drop major/minor version variables. - Cosmetic improvements.

Update to 0.21.10

95e1b9e

mpd: 0.21.10 -> 0.21.11

94fe797

mpd: 0.21.11 -> 0.21.12

05ea81d

mpd: log to journal

3639826

mpd: 0.21.12 -> 0.21.14

12597c8

mpd: add tobim to maintainers

21c7563

mpd: reenable syslog support

c0bdc38

mpd: 0.21.14 -> 0.21.15

c3011fc

mpd: 0.21.15 -> 0.21.16

7620da0

tobim force-pushed the mpd-0.21 branch from 5b9effa to 7620da0 Compare November 10, 2019 21:39

ofborg bot requested review from astsmtl, ehmry, Fuuzetsu and fpletz November 10, 2019 21:48

ofborg bot added the 11.by: package-maintainer label Nov 10, 2019

fpletz self-assigned this Nov 13, 2019

fpletz changed the title ~~mpd: 0.20.13 -> 0.21.15~~ mpd: 0.20.13 -> 0.21.16 Nov 13, 2019

fpletz approved these changes Nov 13, 2019

View reviewed changes

fpletz merged commit 4a9d549 into NixOS:master Nov 13, 2019

tobim deleted the mpd-0.21 branch November 13, 2019 23:11

doronbehar mentioned this pull request May 16, 2020

mpd: Add support for meson options #87940

Closed

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mpd: 0.20.13 -> 0.21.16 #57608

mpd: 0.20.13 -> 0.21.16 #57608

tobim commented Mar 13, 2019 •

edited

tobim commented Mar 13, 2019

tobim commented Mar 14, 2019

tobim commented Mar 29, 2019

tobim commented Mar 29, 2019

immae commented Apr 22, 2019

immae commented Apr 22, 2019

tobim commented May 12, 2019

immae commented May 12, 2019

immae commented May 12, 2019 •

edited

Ekleog commented Jun 15, 2019

Ekleog left a comment

aanderse commented Jul 14, 2019

Ekleog commented Jul 19, 2019

tobim commented Jul 24, 2019 •

edited

tobim commented Jul 25, 2019

fpletz left a comment

arcnmx commented Nov 13, 2019

fpletz commented Nov 13, 2019

mpd: 0.20.13 -> 0.21.16 #57608

mpd: 0.20.13 -> 0.21.16 #57608

Conversation

tobim commented Mar 13, 2019 • edited

Motivation for this change

Things done

tobim commented Mar 13, 2019

tobim commented Mar 14, 2019

tobim commented Mar 29, 2019

tobim commented Mar 29, 2019

immae commented Apr 22, 2019

immae commented Apr 22, 2019

tobim commented May 12, 2019

immae commented May 12, 2019

immae commented May 12, 2019 • edited

Ekleog commented Jun 15, 2019

Ekleog left a comment

Choose a reason for hiding this comment

aanderse commented Jul 14, 2019

Ekleog commented Jul 19, 2019

tobim commented Jul 24, 2019 • edited

tobim commented Jul 25, 2019

fpletz left a comment

Choose a reason for hiding this comment

arcnmx commented Nov 13, 2019

fpletz commented Nov 13, 2019

tobim commented Mar 13, 2019 •

edited

immae commented May 12, 2019 •

edited

tobim commented Jul 24, 2019 •

edited