From fde3a6e26dbed44056d463364bf27ab424ddae3c Mon Sep 17 00:00:00 2001
From: Lucy Hochkamp <git@xyno.systems>
Date: Thu, 18 Sep 2025 21:02:06 +0200
Subject: [PATCH] beets: 2.3.1 -> 2.4.0

---
 pkgs/tools/audio/beets/builtin-plugins.nix | 2 ++
 pkgs/tools/audio/beets/common.nix          | 2 ++
 pkgs/tools/audio/beets/default.nix         | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index 8bc64e424512..3961eec1e0df 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -133,12 +133,14 @@
     propagatedBuildInputs = [ python3Packages.mpd2 ];
     testPaths = [ ];
   };
+  musicbrainz = { };
   parentwork = { };
   permissions = { };
   play = { };
   playlist.propagatedBuildInputs = [ python3Packages.requests ];
   plexupdate = { };
   random = { };
+  replace = { };
   replaygain.wrapperBins = [
     aacgain
     ffmpeg
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index e387329c0075..3854d26dc74f 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -176,6 +176,8 @@ python3Packages.buildPythonApplication {
   disabledTests = disabledTests ++ [
     # https://github.com/beetbox/beets/issues/5880
     "test_reject_different_art"
+    # touches network
+    "test_merge_duplicate_album"
   ];
 
   # Perform extra "sanity checks", before running pytest tests.
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index d13ce2d71c5c..f82175e39bec 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.3.1";
+      version = "2.4.0";
       src = fetchFromGitHub {
         owner = "beetbox";
         repo = "beets";
         tag = "v${version}";
-        hash = "sha256-INxL2XDn8kwRYYcZATv/NdLmAtfQvxVDWKB1OYo8dxY=";
+        hash = "sha256-BM4NW8iukw9+zLD2cfAETmFYNAiNPUn9cLrkVlCE+jM=";
       };
     };