Merge pull request #316918 from doronbehar/pkg/acousticbrainz-remove

acousticbrainz-client: remove

pkgs/tools/audio/acousticbrainz-client/default.nix

@@ -1,42 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, essentia-extractor }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "acousticbrainz-client";
-  version = "0.1";
-
-  src = fetchFromGitHub {
-    owner = "MTG";
-    repo = "acousticbrainz-client";
-    rev = version;
-    sha256 = "1g1nxh58939vysfxplrgdz366dlqnic05pkzbqh75m79brg4yrv1";
-  };
-
-  propagatedBuildInputs = [ essentia-extractor python3Packages.requests ];
-
-  postPatch = ''
-    # The installer needs the streaming_extractor_music binary in the source directoy,
-    # so we provide a symlink to it.
-    ln -s ${essentia-extractor}/bin/streaming_extractor_music streaming_extractor_music
-  '';
-
-  postInstall = ''
-    # The installer includes a copy of the streaming_extractor_music binary (not a symlink),
-    # which we don't need, because the wrapper adds essentia-extractor/binary to PATH.
-    rm $out/bin/streaming_extractor_music
-  '';
-
-  # Tests seem to be broken, but the tool works
-  doCheck = false;
-
-  pythonImportsCheck = [ "abz" ];
-
-  meta = with lib; {
-    description = "A client to upload data to an AcousticBrainz server";
-    license = licenses.gpl3Plus;
-    homepage = "https://github.com/MTG/acousticbrainz-client";
-    # essentia-extractor is only available for those platforms
-    platforms = [ "x86_64-linux" "i686-linux" ];
-    maintainers = with maintainers; [ ];
-    mainProgram = "abzsubmit";
-  };
-}

pkgs/tools/audio/beets/builtin-plugins.nix

@@ -13,8 +13,7 @@
 , ...
 }: {
   absubmit = {
-    enable = lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms;
-    wrapperBins = [ essentia-extractor ];
+    deprecated = true;
     testPaths = [ ];
   };
   acousticbrainz.propagatedBuildInputs = [ python3Packages.requests ];

pkgs/tools/audio/beets/common.nix

@@ -55,7 +55,15 @@ let
   };
 
   basePlugins = lib.mapAttrs (_: a: { builtin = true; } // a) (import ./builtin-plugins.nix inputs);
-  allPlugins = lib.mapAttrs (n: a: mkPlugin { name = n; } // a) (lib.recursiveUpdate basePlugins pluginOverrides);
+  pluginOverrides' = lib.mapAttrs
+    (plugName: lib.throwIf
+      (basePlugins.${plugName}.deprecated or false)
+      "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
+    )
+    pluginOverrides
+  ;
+
+  allPlugins = lib.mapAttrs ( n: a: mkPlugin { name = n; } // a) (lib.recursiveUpdate basePlugins pluginOverrides');
   builtinPlugins = lib.filterAttrs (_: p: p.builtin) allPlugins;
   enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins;
   disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins;

pkgs/top-level/aliases.nix

@@ -59,6 +59,7 @@ mapAliases ({
   AusweisApp2 = ausweisapp; # Added 2023-11-08
   a4term = a4; # Added 2023-10-06
   acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27
+  acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04
   adtool = throw "'adtool' has been removed, as it was broken and unmaintained";
   adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29

pkgs/top-level/all-packages.nix

@@ -1501,8 +1501,6 @@ with pkgs;
 
   acme-sh = callPackage ../tools/admin/acme-sh { };
 
-  acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { };
-
   alsaequal = callPackage ../tools/audio/alsaequal { };
 
   acpica-tools = callPackage ../tools/system/acpica-tools { };