From c29abd19e24822d9a9f4d9ec20879d0af2bdb1de Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 8 Apr 2025 18:35:10 +0200
Subject: [PATCH 1/2] beetsPackages.extrafiles: move deprecation behind
 allowAliases

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

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 70d3b644d692..b0d7e1a40f2b 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   callPackage,
+  config,
   fetchFromGitHub,
   python3Packages,
   fetchpatch,
@@ -70,6 +71,6 @@ lib.makeExtensible (self: {
   alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
   audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; };
   copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
-
+} // lib.optionalAttrs config.allowAliases {
   extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
 })

From f0afc91242e2ea89e534287a3839539b70d2f807 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 8 Apr 2025 18:36:12 +0200
Subject: [PATCH 2/2] beetsPackages: format

---
 pkgs/tools/audio/beets/default.nix | 58 ++++++++++++++++--------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index b0d7e1a40f2b..750626191970 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -41,36 +41,40 @@ let
     })
   ];
 in
-lib.makeExtensible (self: {
-  beets = self.beets-stable;
+lib.makeExtensible (
+  self:
+  {
+    beets = self.beets-stable;
 
-  beets-stable = callPackage ./common.nix rec {
-    inherit python3Packages extraPatches;
-    version = "2.2.0";
-    src = fetchFromGitHub {
-      owner = "beetbox";
-      repo = "beets";
-      tag = "v${version}";
-      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
+    beets-stable = callPackage ./common.nix rec {
+      inherit python3Packages extraPatches;
+      version = "2.2.0";
+      src = fetchFromGitHub {
+        owner = "beetbox";
+        repo = "beets";
+        tag = "v${version}";
+        hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
+      };
     };
-  };
 
-  beets-minimal = self.beets.override { disableAllPlugins = true; };
+    beets-minimal = self.beets.override { disableAllPlugins = true; };
 
-  beets-unstable = callPackage ./common.nix {
-    inherit python3Packages;
-    version = "2.2.0-unstable-2025-03-12";
-    src = fetchFromGitHub {
-      owner = "beetbox";
-      repo = "beets";
-      rev = "670a3bcd17a46883c71cf07dd313fcd0dff4be9d";
-      hash = "sha256-hSY7FhpPL4poOY1/gqk7oLNgQ7KA/MJqx50xOLIP0QA=";
+    beets-unstable = callPackage ./common.nix {
+      inherit python3Packages;
+      version = "2.2.0-unstable-2025-03-12";
+      src = fetchFromGitHub {
+        owner = "beetbox";
+        repo = "beets";
+        rev = "670a3bcd17a46883c71cf07dd313fcd0dff4be9d";
+        hash = "sha256-hSY7FhpPL4poOY1/gqk7oLNgQ7KA/MJqx50xOLIP0QA=";
+      };
     };
-  };
 
-  alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
-  audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; };
-  copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
-} // lib.optionalAttrs config.allowAliases {
-  extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
-})
+    alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
+    audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; };
+    copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
+  }
+  // lib.optionalAttrs config.allowAliases {
+    extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
+  }
+)