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.

Sign up for GitHub

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions pkgs/tools/audio/beets/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
callPackage,
fetchFromGitHub,
python3Packages,
fetchpatch,
}:
/*
** To customize the enabled beets plugins, use the pluginOverrides input to the
Expand All @@ -17,39 +18,42 @@
** alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; };
** }; }
*/
let
extraPatches = [
# Bash completion fix for Nix
./patches/bash-completion-always-print.patch
# Remove after next release.
(fetchpatch {
url = "https://github.com/beetbox/beets/commit/bcc79a5b09225050ce7c88f63dfa56f49f8782a8.patch?full_index=1";
hash = "sha256-Y2Q5Co3UlDGKuzfxUvdUY3rSMNpsBoDW03ZWZOfzp3Y=";
})
];
in
lib.makeExtensible (self: {
beets = self.beets-stable;

beets-stable = callPackage ./common.nix rec {
inherit python3Packages;
inherit python3Packages extraPatches;
version = "2.2.0";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "v${version}";
hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
};
extraPatches = [
# Bash completion fix for Nix
./patches/bash-completion-always-print.patch
];
};

beets-minimal = self.beets.override { disableAllPlugins = true; };

beets-unstable = callPackage ./common.nix {
inherit python3Packages;
inherit python3Packages extraPatches;
version = "2.2.0-unstable-2024-12-02";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "f92c0ec8b14fbd59e58374fd123563123aef197b";
hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
};
extraPatches = [
# Bash completion fix for Nix
./patches/bash-completion-always-print.patch
];
};

alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
Expand Down
Loading