gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

beets: 2.2.0 -> 2.3.0 (#405156)

Browse Source
This commit is contained in:
Doron Behar
2025-05-13 10:51:42 +03:00
committed by GitHub
parent e1772b130f 592a9e90da
commit e394af8222
5 changed files with 110 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/audio/beets/default.nix
+6 -22
View File
@@ -4,7 +4,6 @@
config,
fetchFromGitHub,
python3Packages,
fetchpatch,
}:
/*
** To customize the enabled beets plugins, use the pluginOverrides input to the
@@ -21,24 +20,8 @@
*/
let
extraPatches = [
(fetchpatch {
# Already on master. TODO: remove when updating to the next release
# Issue: https://github.com/beetbox/beets/issues/5527
# PR: https://github.com/beetbox/beets/pull/5650
name = "fix-im-backend";
url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch";
hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ=";
excludes = [
"docs/changelog.rst"
];
})
# 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 (
@@ -48,12 +31,12 @@ lib.makeExtensible (
beets-stable = callPackage ./common.nix rec {
inherit python3Packages extraPatches;
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
tag = "v${version}";
hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
hash = "sha256-mH3m2O+q5Ys9DJD3ulmhViyf/VPEpHevjmNerVe327s=";
};
};
@@ -61,18 +44,19 @@ lib.makeExtensible (
beets-unstable = callPackage ./common.nix {
inherit python3Packages;
version = "2.2.0-unstable-2025-03-12";
version = "2.3.0";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "670a3bcd17a46883c71cf07dd313fcd0dff4be9d";
hash = "sha256-hSY7FhpPL4poOY1/gqk7oLNgQ7KA/MJqx50xOLIP0QA=";
rev = "250b0da900c095a09bedc1a0717381010c01a3c6";
hash = "sha256-mH3m2O+q5Ys9DJD3ulmhViyf/VPEpHevjmNerVe327s=";
};
};
alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; };
copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
filetote = callPackage ./plugins/filetote.nix { beets = self.beets-minimal; };
}
// lib.optionalAttrs config.allowAliases {
extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
pkgs/tools/audio/beets/plugins/alternatives.nix
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "beets-alternatives";
version = "0.13.2";
version = "0.13.3";
pyproject = true;
src = fetchFromGitHub {
repo = "beets-alternatives";
owner = "geigerzaehler";
tag = "v${version}";
hash = "sha256-OoQsP+QVIOnSA4oy1a8JJ3VeCUS+GR8sPPOysvmRMqI=";
hash = "sha256-j56AzbpZFACXy5KqafE8PCC+zM6pXrxr/rWy9UjZPQg=";
};
nativeBuildInputs = [
pkgs/tools/audio/beets/plugins/audible.nix
+9 -7
View File
@@ -17,19 +17,21 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-Sds16h+W9t7N755ADPXXDi+SxwouBMxP9ApUqaXedqY=";
};
nativeBuildInputs = [
beets
];
pythonRelaxDeps = true;
build-system = with python3Packages; [
hatchling
];
dependencies =
[ beets ]
++ (with python3Packages; [
markdownify
natsort
tldextract
]);
dependencies = with python3Packages; [
markdownify
natsort
tldextract
];
passthru = {
updateScript = nix-update-script { };
pkgs/tools/audio/beets/plugins/copyartifacts.nix
+10 -4
View File
@@ -19,7 +19,6 @@ python3Packages.buildPythonApplication rec {
};
postPatch = ''
sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py
sed -i -e '/namespace_packages/d' setup.py
printf 'from pkgutil import extend_path\n__path__ = extend_path(__path__, __name__)\n' >beetsplug/__init__.py
@@ -28,13 +27,20 @@ python3Packages.buildPythonApplication rec {
sed -i -e 's/util\.py3_path/os.fsdecode/g' tests/_common.py
'';
build-system = with python3Packages; [ setuptools ];
nativeBuildInputs = [
beets
];
dependencies = with python3Packages; [ six ];
build-system = with python3Packages; [
setuptools
];
dependencies = with python3Packages; [
six
];
nativeCheckInputs = [
python3Packages.pytestCheckHook
beets
writableTmpDirAsHomeHook
];
pkgs/tools/audio/beets/plugins/filetote.nix
+83
View File
@@ -0,0 +1,83 @@
{
lib,
fetchFromGitHub,
python3Packages,
beets,
beetsPackages,
writableTmpDirAsHomeHook,
}:
python3Packages.buildPythonApplication rec {
pname = "beets-filetote";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "gtronset";
repo = "beets-filetote";
tag = "v${version}";
hash = "sha256-LTJwZI/kQc+Iv0y8jAi5Xdh4wLEwbTA9hV76ndQsQzU=";
};
postPatch = ''
substituteInPlace pyproject.toml --replace-fail "poetry-core<2.0.0" "poetry-core"
'';
nativeBuildInputs = [
beets
];
build-system = [ python3Packages.poetry-core ];
dependencies = with python3Packages; [
mediafile
reflink
toml
typeguard
];
optional-dependencies = {
lint = with python3Packages; [
black
check-manifest
flake8
flake8-bugbear
flake8-bugbear-pyi
isort
mypy
pylint
typing_extensions
];
test = with python3Packages; [
beetsPackages.audible
mediafile
pytest
reflink
toml
typeguard
];
dev = optional-dependencies.lint ++ optional-dependencies.test ++ [ python3Packages.tox ];
};
pytestFlagsArray = [ "-r fEs" ];
disabledTestPaths = [
"tests/test_cli_operation.py"
"tests/test_pruning.py"
"tests/test_version.py"
];
nativeCheckInputs = [
python3Packages.pytestCheckHook
writableTmpDirAsHomeHook
] ++ optional-dependencies.test;
meta = with lib; {
description = "Beets plugin to move non-music files during the import process";
homepage = "https://github.com/gtronset/beets-filetote";
changelog = "https://github.com/gtronset/beets-filetote/blob/${src.rev}/CHANGELOG.md";
maintainers = with maintainers; [ dansbandit ];
license = licenses.mit;
inherit (beets.meta) platforms;
};
}