-
-
Notifications
You must be signed in to change notification settings - Fork 15.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
beets: 2.0.0 -> 2.2.0 #358086
beets: 2.0.0 -> 2.2.0 #358086
Conversation
891d5b5
to
d1a90be
Compare
This comment was marked as outdated.
This comment was marked as outdated.
b72c4d8
to
c493abe
Compare
This comment was marked as outdated.
This comment was marked as outdated.
00d3108
to
0995bdf
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as resolved.
This comment was marked as resolved.
|
1d6a89e
to
e72af33
Compare
I've been using Up until the release of 2.1.0, I had been applying a patch via |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks pretty good to me! Thanks a lot, I wonder why only now I got pinged for a review. Ideally, I'd have liked to see the changes in a different order. The following 4, are fixes / improvements to the current state of the package (many thanks for that!):
beets: add @montchr as co-maintainer
beetsPackages.extrafiles: remove broken/unmaintained plugin
beets: mark builtin acousticbrainz plugin as deprecated
beets: alphabetize builtin plugins
beets: small reformatting and dead code removal
And the rest of the PR is really only an update to beets-{,un}stable
, so can be squashed to 2 commit:
beets-stable: 2.0.0 -> 2.1.0
beets-unstable: 2.0.0-unstable-2024-05-25 -> 2.1.0-unstable-2024-11-22
pkgs/tools/audio/beets/common.nix
Outdated
pytestFlagsArray = [ | ||
# beets.ui.UserError: unknown command 'autobpm' | ||
"--deselect" "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_command" | ||
|
||
# AssertionError: assert 0 == 117 | ||
"--deselect" "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_import" | ||
]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't work with the disabledTests
array variable?
, testPaths ? [ | ||
# NOTE: This conditional can be removed when beets-stable is updated and | ||
# the default plugins test path is changed | ||
(if (lib.versions.majorMinor version) == "1.6" then | ||
"test/test_${name}.py" | ||
else | ||
"test/plugins/test_${name}.py" | ||
) | ||
] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change can be detached from the update commit.
pkgs/tools/audio/beets/common.nix
Outdated
@@ -68,26 +60,31 @@ let | |||
disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins; | |||
|
|||
pluginWrapperBins = concatMap (p: p.wrapperBins) (attrValues enabledPlugins); | |||
|
|||
disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (_: v: v.testPaths) disabledPlugins)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change too is very welcome, but can be detached from the update commit.
@doronbehar Thanks for the review! I'm working on addressing those changes.
What about the changes to |
Yes these commit conventions should be good for that package too, as this way ofborg will automatically be triggered to build that plugin as well.
|
As noted in a comment in the package expression, the third-party `extrafiles` plugin has not been maintained since 2020 and has been broken since the release of beets version 2.0.0 in May 2024. Since the `beets-stable` package has been updated to version 2.0.0, it is no longer feasible to keep `beetsPackages.extrafiles` around.
This happened in v2.0.0.
Most were already in order but some plugins were thrown in at the bottom of the file.
I fixed the commit log as I wanted, and fixed the merge conflict (due to #357903). Now this should be good after CI is green. |
e72af33
to
7a703bc
Compare
7a703bc
to
395b04b
Compare
Ofborg failed to eval here, but the new evaluations succeeded. I also tested manually the build on aarch64-darwin, so I'm merging. |
https://github.com/beetbox/beets/blob/v2.1.0/docs/changelog.rst
Note that this release includes a lot of improvements to the upstream project's build system, so a refactor of
common.nix
was in order.Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.