From d99cedfa7104a256f4a6244482c90742577fe4a6 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 17:34:34 -0700
Subject: [PATCH 1/2] adcde: modernize

---
 pkgs/applications/audio/abcde/default.nix | 29 ++++++++++-------------
 pkgs/top-level/all-packages.nix           |  4 +---
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 99dca3fe1716..517ddd6539e3 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -8,23 +8,20 @@
   which,
   vorbis-tools,
   id3v2,
-  eyed3,
+  python3Packages,
   lame,
   flac,
   glyr,
   perlPackages,
   makeWrapper,
 }:
-
-let
-  version = "2.9.3";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "abcde";
-  inherit version;
+  version = "2.9.3";
+
   src = fetchurl {
-    url = "https://abcde.einval.com/download/abcde-${version}.tar.gz";
-    sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04";
+    url = "https://abcde.einval.com/download/abcde-${finalAttrs.version}.tar.gz";
+    hash = "sha256-BGzQu6eN1LvcvPgv5iWGXGDfNaAFSC3hOmaZxaO4MSQ=";
   };
 
   # FIXME: This package does not support `distmp3', `eject', etc.
@@ -35,7 +32,7 @@ stdenv.mkDerivation {
             s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \
       "Makefile";
 
-    echo 'CDPARANOIA=${libcdio-paranoia}/bin/cd-paranoia' >>abcde.conf
+    echo 'CDPARANOIA=${lib.getExe libcdio-paranoia}' >>abcde.conf
     echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf
 
     substituteInPlace "abcde" \
@@ -66,7 +63,7 @@ stdenv.mkDerivation {
             wget
             vorbis-tools
             id3v2
-            eyed3
+            python3Packages.eyed3
             lame
             flac
             glyr
@@ -75,10 +72,10 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://abcde.einval.com/wiki/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ ];
     description = "Command-line audio CD ripper";
     longDescription = ''
       abcde is a front-end command-line utility (actually, a shell
@@ -86,6 +83,6 @@ stdenv.mkDerivation {
       Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack)
       format, and tags them, all in one go.
     '';
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad1bacc7f5e4..6b39ed6181f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11898,9 +11898,7 @@ with pkgs;
     patches = config."2bwm".patches or [ ];
   };
 
-  abcde = callPackage ../applications/audio/abcde {
-    inherit (python3Packages) eyed3;
-  };
+  abcde = callPackage ../applications/audio/abcde { };
 
   acd-cli = callPackage ../applications/networking/sync/acd_cli {
     inherit (python3Packages)

From d847c941b7b33b5e0b92d4aed5a47cece01e9241 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 17:35:26 -0700
Subject: [PATCH 2/2] abcde: move to by-name

---
 .../audio/abcde/default.nix => by-name/ab/abcde/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/audio/abcde/default.nix => by-name/ab/abcde/package.nix} (100%)

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/by-name/ab/abcde/package.nix
similarity index 100%
rename from pkgs/applications/audio/abcde/default.nix
rename to pkgs/by-name/ab/abcde/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b39ed6181f0..d7c5612124c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11898,8 +11898,6 @@ with pkgs;
     patches = config."2bwm".patches or [ ];
   };
 
-  abcde = callPackage ../applications/audio/abcde { };
-
   acd-cli = callPackage ../applications/networking/sync/acd_cli {
     inherit (python3Packages)
       buildPythonApplication