From bc44f3cfd6c8566515f31b162aa4117f6560d740 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 14 May 2025 15:01:44 +0300
Subject: [PATCH 1/3] beets: 2.3.0 -> 2.3.1

---
 pkgs/tools/audio/beets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index a0ff569b4179..7cbac4e46809 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.0";
+      version = "2.3.1";
       src = fetchFromGitHub {
         owner = "beetbox";
         repo = "beets";
         tag = "v${version}";
-        hash = "sha256-mH3m2O+q5Ys9DJD3ulmhViyf/VPEpHevjmNerVe327s=";
+        hash = "sha256-INxL2XDn8kwRYYcZATv/NdLmAtfQvxVDWKB1OYo8dxY=";
       };
     };
 

From be0f7980b913d80a1a2381fc917aebdf3c6e4db1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 14 May 2025 15:01:55 +0300
Subject: [PATCH 2/3] beets-unstable: 2.3.0 -> 2.3.1

---
 pkgs/tools/audio/beets/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 7cbac4e46809..d13ce2d71c5c 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -44,12 +44,12 @@ lib.makeExtensible (
 
     beets-unstable = callPackage ./common.nix {
       inherit python3Packages;
-      version = "2.3.0";
+      version = "2.3.1";
       src = fetchFromGitHub {
         owner = "beetbox";
         repo = "beets";
-        rev = "250b0da900c095a09bedc1a0717381010c01a3c6";
-        hash = "sha256-mH3m2O+q5Ys9DJD3ulmhViyf/VPEpHevjmNerVe327s=";
+        rev = "d487d675b9115672c484eab8a6729b1f0fd24b68";
+        hash = "sha256-INxL2XDn8kwRYYcZATv/NdLmAtfQvxVDWKB1OYo8dxY=";
       };
     };
 

From 522dee2992701669db9cf1cf71330bddb6816f63 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 14 May 2025 17:49:30 +0300
Subject: [PATCH 3/3] beets: Remove <2.2.0 conditionals

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

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index ece354ab29e7..432780d0455c 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -171,9 +171,6 @@
     flask-cors
   ];
   zero = { };
-}
-# NOTE: There will be no need for this conditional once beets is updated.
-// lib.optionalAttrs (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") {
   _typing = {
     testPaths = [ ];
   };
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index d06e10494b59..c914a44ef616 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -101,8 +101,6 @@ python3Packages.buildPythonApplication {
       pyyaml
       unidecode
       typing-extensions
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [
       lap
     ]
     ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
@@ -151,8 +149,6 @@ python3Packages.buildPythonApplication {
       mock
       rarfile
       responses
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [
       requests-mock
     ]
     ++ [