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 = [ diff --git a/pkgs/development/python-modules/beets-filetote/default.nix b/pkgs/development/python-modules/beets-filetote/default.nix index e64240fd22c1..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, @@ -14,7 +13,6 @@ pytestCheckHook, beets-audible, mediafile, - pytest, reflink, toml, typeguard, @@ -23,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 = [ @@ -56,9 +46,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ mediafile - reflink - toml - typeguard ]; nativeCheckInputs = [ @@ -71,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 = { diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index e0eb7ef3f293..6507544714d6 100644 --- a/pkgs/development/python-modules/beets/default.nix +++ b/pkgs/development/python-modules/beets/default.nix @@ -113,12 +113,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;