From 757494342b22c4d57fb41aff7357f4a5ca6f7b89 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Mon, 15 Dec 2025 13:59:07 -0800
Subject: [PATCH 1/2] python3.pkgs.beetcamp: add
 `passthru.tests.beets-with-beetcamp`

See: https://github.com/NixOS/nixpkgs/pull/473678#discussion_r2644975474
---
 .../python-modules/beetcamp/default.nix           | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/beetcamp/default.nix b/pkgs/development/python-modules/beetcamp/default.nix
index 775c96ddf7ba..1f6361274df6 100644
--- a/pkgs/development/python-modules/beetcamp/default.nix
+++ b/pkgs/development/python-modules/beetcamp/default.nix
@@ -13,6 +13,7 @@
   filelock,
   writableTmpDirAsHomeHook,
   nix-update-script,
+  beetcamp ? null, # For `passthru.tests`.
 }:
 
 let
@@ -58,7 +59,19 @@ buildPythonPackage {
     "test_get_html"
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      beets-with-beetcamp = beets.override {
+        pluginOverrides = {
+          beetcamp = {
+            enable = true;
+            propagatedBuildInputs = [ beetcamp ];
+          };
+        };
+      };
+    };
+  };
 
   meta = {
     description = "Bandcamp autotagger source for beets (http://beets.io)";

From a50d2a7f7ccaa932926dfe28c0f5fdb121ac7c94 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Mon, 15 Dec 2025 13:59:07 -0800
Subject: [PATCH 2/2] python3.pkgs.beetcamp: move beets dependency to
 `nativeBuildInputs`

This will make it possible to use `beetcamp` without setting
`dontUsePythonCatchConflicts = true` in an override.

See: https://github.com/NixOS/nixpkgs/pull/471166#discussion_r2642534939
---
 pkgs/development/python-modules/beetcamp/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/beetcamp/default.nix b/pkgs/development/python-modules/beetcamp/default.nix
index 1f6361274df6..5122d9932d0d 100644
--- a/pkgs/development/python-modules/beetcamp/default.nix
+++ b/pkgs/development/python-modules/beetcamp/default.nix
@@ -40,12 +40,15 @@ buildPythonPackage {
   ];
 
   dependencies = [
-    beets
     httpx
     packaging
     pycountry
   ];
 
+  nativeBuildInputs = [
+    beets
+  ];
+
   nativeCheckInputs = [
     writableTmpDirAsHomeHook
     pytestCheckHook