5 files changed, 65 insertions, 58 deletions
diff --git a/modules/home.legacy/conf/beets/default.nix b/modules/home.legacy/conf/beets/default.nix
index 8d6277b7..e0421a9d 100644
--- a/modules/home.legacy/conf/beets/default.nix
+++ b/modules/home.legacy/conf/beets/default.nix
@@ -5,6 +5,16 @@
   ...
 }: let
   plugins = import ./plugins.nix {};
+
+  # TODO: Enable xtractor again <2025-03-29>
+  # package = pkgs.beets.override {
+  #   pluginOverrides = {
+  #     xtractor = {
+  #       enable = true;
+  #       propagatedBuildInputs = [pkgs.beetsExtraPlugins.xtractor];
+  #     };
+  #   };
+  package = pkgs.beets;
 in {
   imports = [
     ./plugins
@@ -12,14 +22,7 @@ in {
 
   programs.beets = {
     enable = true;
-    package = pkgs.beets.override {
-      pluginOverrides = {
-        xtractor = {
-          enable = true;
-          propagatedBuildInputs = [pkgs.beetsExtraPlugins.xtractor];
-        };
-      };
-    };
+    inherit package;
 
     settings = {
       library = "${config.xdg.dataHome}/beets/library.db";
diff --git a/modules/home.legacy/conf/beets/plugins.nix b/modules/home.legacy/conf/beets/plugins.nix
index bea2fefe..9500364b 100644
--- a/modules/home.legacy/conf/beets/plugins.nix
+++ b/modules/home.legacy/conf/beets/plugins.nix
@@ -12,7 +12,7 @@
   "mbsubmit"
 
   # Extract things from the music file
-  "xtractor"
+  # "xtractor"
 
   # Calculate replay gain
   "replaygain"
diff --git a/modules/home.legacy/conf/beets/plugins/default.nix b/modules/home.legacy/conf/beets/plugins/default.nix
index 3bea5ea8..a0b44e3c 100644
--- a/modules/home.legacy/conf/beets/plugins/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/default.nix
@@ -11,6 +11,6 @@
     ./play
     ./replaygain
     ./smartplaylist
-    ./xtractor
+    # ./xtractor
   ];
 }
diff --git a/pkgs/by-name/be/beetsExtraPlugins/package.nix b/pkgs/by-name/be/beetsExtraPlugins/package.nix
index 0da472fa..1cea9d3b 100644
--- a/pkgs/by-name/be/beetsExtraPlugins/package.nix
+++ b/pkgs/by-name/be/beetsExtraPlugins/package.nix
@@ -1,3 +1,3 @@
 {pkgs, ...}: {
-  xtractor = pkgs.callPackage ./xtractor.nix {beets = pkgs.beetsPackages.beets-minimal;};
+  # xtractor = pkgs.callPackage ./xtractor.nix {beets = pkgs.beetsPackages.beets-minimal;};
 }
diff --git a/pkgs/by-name/be/beetsExtraPlugins/xtractor.nix b/pkgs/by-name/be/beetsExtraPlugins/xtractor.nix
index 01c6207a..ecbc10ce 100644
--- a/pkgs/by-name/be/beetsExtraPlugins/xtractor.nix
+++ b/pkgs/by-name/be/beetsExtraPlugins/xtractor.nix
@@ -4,51 +4,55 @@
   python3Packages,
   beets,
 }:
-# FIXME: Find a way to update this derivation <2024-08-11>
-let
-  version = "0.4.2";
-  models = builtins.fetchTarball {
-    url = "https://essentia.upf.edu/svm_models/essentia-extractor-svm_models-v2.1_beta5.tar.gz";
-    sha256 = "11ps1l4h8bl4l9rlvkhjs61908l18dh7mpq65brm8ki99hnp9g64";
-  };
-in
-  python3Packages.buildPythonApplication {
-    inherit version;
-    pname = "beets-xtractor";
-    pyproject = true;
+# # NOTE: This fails to build now. It didn't work anyways. See
+# https://git.sr.ht/~johnhamelink/nix/tree/master/item/home/hosts/sun/beets/beets-plugin-xtractor.nix
+# for a possibly working version. <2025-03-29>
 
-    src = fetchFromGitHub {
-      repo = "BeetsPluginXtractor";
-      owner = "adamjakab";
-      rev = "v${version}";
-      hash = "sha256-it4qQ2OS4qBEaGLJK8FVGpjlvg0MQICazV7TAM8lH9s=";
-    };
-
-    nativeBuildInputs = [
-      beets
-      python3Packages.setuptools
-    ];
-
-    passthru = {inherit models;};
-
-    nativeCheckInputs = with python3Packages; [
-      pytestCheckHook
-      pytest-cov
-      mock
-      typeguard
-    ];
-
-    preCheck = ''
-      export HOME="$(mktemp -d)"
-    '';
-    postInstall = ''
-      mkdir --parents $out/models
-      cp ${models}/* $out/models
-    '';
-
-    meta = {
-      description = "Obtain low and high level musical information from your song";
-      homepage = "https://github.com/adamjakab/BeetsPluginXtractor/releasesfhhhhh";
-      license = lib.licenses.mit;
-    };
-  }
+# # FIXME: Find a way to update this derivation <2024-08-11>
+# let
+#   version = "0.4.2";
+#   models = builtins.fetchTarball {
+#     url = "https://essentia.upf.edu/svm_models/essentia-extractor-svm_models-v2.1_beta5.tar.gz";
+#     sha256 = "11ps1l4h8bl4l9rlvkhjs61908l18dh7mpq65brm8ki99hnp9g64";
+#   };
+# in
+#   python3Packages.buildPythonApplication {
+#     inherit version;
+#     pname = "beets-xtractor";
+#     pyproject = true;
+#
+#     src = fetchFromGitHub {
+#       repo = "BeetsPluginXtractor";
+#       owner = "adamjakab";
+#       rev = "v${version}";
+#       hash = "sha256-it4qQ2OS4qBEaGLJK8FVGpjlvg0MQICazV7TAM8lH9s=";
+#     };
+#
+#     nativeBuildInputs = [
+#       beets
+#       python3Packages.setuptools
+#     ];
+#
+#     passthru = {inherit models;};
+#
+#     nativeCheckInputs = with python3Packages; [
+#       pytestCheckHook
+#       pytest-cov
+#       mock
+#       typeguard
+#     ];
+#
+#     preCheck = ''
+#       export HOME="$(mktemp -d)"
+#     '';
+#     postInstall = ''
+#       mkdir --parents $out/models
+#       cp ${models}/* $out/models
+#     '';
+#
+#     meta = {
+#       description = "Obtain low and high level musical information from your song";
+#       homepage = "https://github.com/adamjakab/BeetsPluginXtractor/releasesfhhhhh";
+#       license = lib.licenses.mit;
+#     };
+#   }