From e3129d220797985ec8a0df23805ff0acc8da17d9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 22 Jun 2026 18:12:54 +0300 Subject: [PATCH 1/6] python3Packages.beets: 2.11.0 -> 2.12.0 Diff: https://github.com/beetbox/beets/compare/v2.11.0...v2.12.0 (cherry picked from commit 59a92f1a19522afa0086ddeb74f883bde4e74b6f) --- pkgs/development/python-modules/beets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index b915dd3f15eb..45802be15b09 100644 --- a/pkgs/development/python-modules/beets/default.nix +++ b/pkgs/development/python-modules/beets/default.nix @@ -115,12 +115,12 @@ buildPythonPackage (finalAttrs: { pname = "beets"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; tag = "v${finalAttrs.version}"; - hash = "sha256-fi6D0P2GtEO41VL6UKAArRedZVxw97yqDUAoilktUho="; + hash = "sha256-u2qoZ0/qWq9YUcwbOpsqtIjX5BZ2z2wj00X59Pf+/fk="; }; pyproject = true; From e1d267aa7565c3f0f1bfcf808685df5344690171 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 22 Jun 2026 18:45:03 +0300 Subject: [PATCH 2/6] python3Packages.beets-filetote: remove unused pytest argument (cherry picked from commit bc081a146c5e78a621812fd60fbb8562b797abf4) --- pkgs/development/python-modules/beets-filetote/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/beets-filetote/default.nix b/pkgs/development/python-modules/beets-filetote/default.nix index 3c27dfc65263..2b8da77ec948 100644 --- a/pkgs/development/python-modules/beets-filetote/default.nix +++ b/pkgs/development/python-modules/beets-filetote/default.nix @@ -13,7 +13,6 @@ pytestCheckHook, beets-audible, mediafile, - pytest, reflink, toml, typeguard, From b7e3f7a70b3f9302b1f0e233e5e067aec855222c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 22 Jun 2026 18:49:43 +0300 Subject: [PATCH 3/6] python3Packages.beets-alternatives: fix tests with upstream patch (cherry picked from commit 9247d13ebfb15eed582dc49a7ae168aedb66fb06) --- .../python-modules/beets-alternatives/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/beets-alternatives/default.nix b/pkgs/development/python-modules/beets-alternatives/default.nix index 5144eb45c80c..897481ce5bbd 100644 --- a/pkgs/development/python-modules/beets-alternatives/default.nix +++ b/pkgs/development/python-modules/beets-alternatives/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { url = "https://github.com/geigerzaehler/beets-alternatives/commit/84fdb0fa15225cce1e881b07bddcb52715677915.patch"; hash = "sha256-rURvP7aNJ+I9bPjk43t8rYujOK1iUS1J4RFMAHfa5AU="; }) + # Fix for Beets 2.12; see https://github.com/geigerzaehler/beets-alternatives/pull/234 + (fetchpatch { + url = "https://github.com/geigerzaehler/beets-alternatives/commit/e27772bb627d1b0763685d7add209d40987f2b95.patch"; + hash = "sha256-47HhaYWzHQakGlbUWdfG5qkfvbadbow1i+O74JnKPwM="; + }) ]; build-system = [ From f205a6cd40967d1bbe17398bda2b7ff5e1743f54 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Wed, 10 Jun 2026 20:44:39 +0200 Subject: [PATCH 4/6] python3Packages.beets-filetote: 1.1.1 -> 1.3.5 (cherry picked from commit 7ecacac596fea3d5c5cd7a63300444d87f11799c) --- .../python-modules/beets-filetote/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/beets-filetote/default.nix b/pkgs/development/python-modules/beets-filetote/default.nix index 2b8da77ec948..9daa84a5674c 100644 --- a/pkgs/development/python-modules/beets-filetote/default.nix +++ b/pkgs/development/python-modules/beets-filetote/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch2, buildPythonPackage, # build-system @@ -19,17 +20,26 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "beets-filetote"; - version = "1.1.1"; + version = "1.3.5"; pyproject = true; src = fetchFromGitHub { owner = "gtronset"; repo = "beets-filetote"; - tag = "v${version}"; - hash = "sha256-NsYBsP60SiCfQ63C4WMkshyreFqOSmx3LP5Gwq6ECF0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-qMHjcBrXkVG7U5a1E0yRwNgmg7XinRnK3gnV7jAZLTk="; }; + # needed to keep beetsplug a namespace package, othwise other plugins will not be found + # can be removed with next version + patches = [ + (fetchpatch2 { + url = "https://github.com/gtronset/beets-filetote/commit/762cf0c4b60b8f6b38cf39b027de4241f12cef37.patch?full_index=1"; + hash = "sha256-c7qIECcqwoV4ZOaA/8JYsM6Aym34peWPh7ZLWUxIYSI="; + excludes = [ "CHANGELOG.md" ]; + }) + ]; postPatch = '' substituteInPlace pyproject.toml --replace-fail "poetry-core<2.0.0" "poetry-core" @@ -66,20 +76,12 @@ buildPythonPackage rec { "-rfEs" ]; - disabledTestPaths = [ - "tests/test_cli_operation.py" - "tests/test_pruning.py" - "tests/test_version.py" - ]; - meta = { 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.tag}/CHANGELOG.md"; + changelog = "https://github.com/gtronset/beets-filetote/blob/${finalAttrs.src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ dansbandit ]; license = lib.licenses.mit; inherit (beets-minimal.meta) platforms; - # https://github.com/gtronset/beets-filetote/issues/211 - broken = true; }; -} +}) From 7b2b8435a19b0ea20c788015a2388f02cea19d89 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Wed, 10 Jun 2026 20:46:46 +0200 Subject: [PATCH 5/6] python3Packages.beets-filetote: add returntoreality as maintainer (cherry picked from commit 0f063025b9b8a6cc469869afb0e4db9903c68647) --- pkgs/development/python-modules/beets-filetote/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/beets-filetote/default.nix b/pkgs/development/python-modules/beets-filetote/default.nix index 9daa84a5674c..b9a70cfb93b7 100644 --- a/pkgs/development/python-modules/beets-filetote/default.nix +++ b/pkgs/development/python-modules/beets-filetote/default.nix @@ -80,7 +80,10 @@ buildPythonPackage (finalAttrs: { 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/${finalAttrs.src.tag}/CHANGELOG.md"; - maintainers = with lib.maintainers; [ dansbandit ]; + maintainers = with lib.maintainers; [ + dansbandit + returntoreality + ]; license = lib.licenses.mit; inherit (beets-minimal.meta) platforms; }; From c01708459919f3a00c91288361538d1d45a7645d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 22 Jun 2026 18:29:04 +0300 Subject: [PATCH 6/6] python3Packages.beets-filetote: 1.3.5 -> 1.3.6 Diff: https://github.com/gtronset/beets-filetote/compare/v1.3.5...v1.3.6 Changelog: https://github.com/gtronset/beets-filetote/blob/v1.3.6/CHANGELOG.md (cherry picked from commit 5f925d54e34935056037595ce8abbd7c0f90a7d7) --- .../python-modules/beets-filetote/default.nix | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/beets-filetote/default.nix b/pkgs/development/python-modules/beets-filetote/default.nix index b9a70cfb93b7..7f9883e664ac 100644 --- a/pkgs/development/python-modules/beets-filetote/default.nix +++ b/pkgs/development/python-modules/beets-filetote/default.nix @@ -1,11 +1,10 @@ { lib, fetchFromGitHub, - fetchpatch2, buildPythonPackage, # build-system - poetry-core, + uv-build, # nativeBuildInputs beets-minimal, @@ -22,31 +21,23 @@ buildPythonPackage (finalAttrs: { pname = "beets-filetote"; - version = "1.3.5"; + version = "1.3.6"; pyproject = true; src = fetchFromGitHub { owner = "gtronset"; repo = "beets-filetote"; tag = "v${finalAttrs.version}"; - hash = "sha256-qMHjcBrXkVG7U5a1E0yRwNgmg7XinRnK3gnV7jAZLTk="; + hash = "sha256-ZrF9Z3Eaem8ZzNJgQoW45MvsNOCoLsd7l/yLQ2pldR0="; }; - # needed to keep beetsplug a namespace package, othwise other plugins will not be found - # can be removed with next version - patches = [ - (fetchpatch2 { - url = "https://github.com/gtronset/beets-filetote/commit/762cf0c4b60b8f6b38cf39b027de4241f12cef37.patch?full_index=1"; - hash = "sha256-c7qIECcqwoV4ZOaA/8JYsM6Aym34peWPh7ZLWUxIYSI="; - excludes = [ "CHANGELOG.md" ]; - }) - ]; + # https://github.com/gtronset/beets-filetote/issues/328 postPatch = '' - substituteInPlace pyproject.toml --replace-fail "poetry-core<2.0.0" "poetry-core" + substituteInPlace pyproject.toml --replace-fail "uv_build>=0.11.21,<0.12" "uv-build" ''; build-system = [ - poetry-core + uv-build ]; nativeBuildInputs = [ @@ -55,9 +46,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ mediafile - reflink - toml - typeguard ]; nativeCheckInputs = [ @@ -70,10 +58,12 @@ buildPythonPackage (finalAttrs: { writableTmpDirAsHomeHook ]; - pytestFlags = [ - # This is the same as: - # -r fEs - "-rfEs" + disabledTestPaths = [ + # Tests fail for Beets 2.12.x, see: + # https://github.com/gtronset/beets-filetote/issues/328 + "tests/test_exclude.py::TestExclude::test_exclude_strseq_of_filenames_by_string" + "tests/test_exclude.py::TestExclude::test_exclude_strseq_of_filenames_by_list" + "tests/test_printignored.py::TestPrintIgnored::test_print_ignored" ]; meta = {