From 05df37c9bd96a4ddedcad80c3e368bf374d5fda5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 15 Oct 2025 15:24:54 +0300 Subject: [PATCH 1/2] beets: 2.5.0 -> 2.5.1 --- pkgs/tools/audio/beets/common.nix | 8 ++++++++ pkgs/tools/audio/beets/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 29fdaa91ebcb..6e232ef1c66f 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -112,6 +112,8 @@ python3Packages.buildPythonApplication { gobject-introspection sphinxHook python3Packages.pydata-sphinx-theme + python3Packages.sphinx-design + python3Packages.sphinx-copybutton ] ++ extraNativeBuildInputs; @@ -132,6 +134,12 @@ python3Packages.buildPythonApplication { "html" "man" ]; + # Causes an installManPage error. Not clear why this directory gets generated + # with the manpages. The same directory is observed correctly in + # $doc/share/doc/beets-${version}/html + preInstallSphinx = '' + rm -r .sphinx/man/man/_sphinx_design_static + ''; postInstall = '' mkdir -p $out/share/zsh/site-functions diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index f08a874426cf..39a057cd18c8 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -31,12 +31,12 @@ lib.makeExtensible ( beets-stable = callPackage ./common.nix rec { inherit python3Packages extraPatches; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; tag = "v${version}"; - hash = "sha256-YZvS9oB+v+48i1avQcs6ClnYz4aMqJQ2e6cBiZ4ULb0="; + hash = "sha256-H3jcEHyK13+RHVlV4zp+8M3LZ0Jc2FdmAbLpekGozLA="; }; }; From d646b67f5bb5796605475fa88a9bb9b644a6bef3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 15 Oct 2025 16:23:44 +0300 Subject: [PATCH 2/2] beets: add reflink dependency for reflink option Fixes #437308 . --- pkgs/tools/audio/beets/common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 6e232ef1c66f..132a8f5aebbe 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -103,6 +103,10 @@ python3Packages.buildPythonApplication { platformdirs pyyaml unidecode + # Can be built without it, but is useful on btrfs systems, and doesn't + # add too much to the closure. See: + # https://github.com/NixOS/nixpkgs/issues/437308 + reflink typing-extensions lap ] @@ -202,6 +206,9 @@ python3Packages.buildPythonApplication { "test_reject_different_art" # touches network "test_merge_duplicate_album" + # The existence of the dependency reflink (see comment above), causes this + # test to be run, and it fails in the sandbox. + "test_successful_reflink" ]; # Perform extra "sanity checks", before running pytest tests.