Skip to content
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: fix building in 2025 #370234

Merged
merged 1 commit into from
Jan 2, 2025
Merged

beets: fix building in 2025 #370234

merged 1 commit into from
Jan 2, 2025

Conversation

jackwilsdon
Copy link
Contributor

BucketPluginTest.test_year_single_year_last_folder assumed the next year is 2025, which is no longer true. beetbox/beets#5566 fixes this but there hasn't been a release since.

Fixes #370204.

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.

@doronbehar doronbehar self-requested a review January 2, 2025 13:35
@lucasew
Copy link
Contributor

lucasew commented Jan 2, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370234


x86_64-linux

✅ 17 packages built:
  • beets
  • beets-unstable
  • beets-unstable.dist
  • beets-unstable.doc
  • beets-unstable.man
  • beets.dist
  • beets.doc
  • beets.man
  • beetsPackages.alternatives
  • beetsPackages.alternatives.dist
  • beetsPackages.beets-minimal
  • beetsPackages.beets-minimal.dist
  • beetsPackages.beets-minimal.doc
  • beetsPackages.beets-minimal.man
  • beetsPackages.copyartifacts
  • beetsPackages.copyartifacts.dist
  • supergee

@doronbehar doronbehar merged commit a27925d into NixOS:master Jan 2, 2025
23 of 24 checks passed
@jackwilsdon jackwilsdon deleted the fix-beets branch January 2, 2025 15:46
tobim pushed a commit to tobim/nixpkgs that referenced this pull request Jan 2, 2025
@vcunat vcunat added the backport release-24.11 Backport PR automatically label Jan 2, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 2, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-370234-to-release-24.11 origin/release-24.11
cd .worktree/backport-370234-to-release-24.11
git switch --create backport-370234-to-release-24.11
git cherry-pick -x 87ba234f1bcb9fb80e87754dac9828196103aeba

@vcunat
Copy link
Member

vcunat commented Jan 6, 2025

On 24.11 there's a different version of beets. Even after resolving nixpkgs conflicts the patch won't apply when you do the build. So the package will be broken now on 24.11.

@doronbehar
Copy link
Contributor

Here I simply backported everything in 1 commit:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: beets
4 participants