diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/by-name/as/asciidoc/package.nix
similarity index 98%
rename from pkgs/tools/typesetting/asciidoc/default.nix
rename to pkgs/by-name/as/asciidoc/package.nix
index a301ee3827f0..ef29ed7f27f7 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/by-name/as/asciidoc/package.nix
@@ -9,12 +9,11 @@
   enableStandardFeatures ? false,
   sourceHighlight,
   highlight,
-  pygments,
   graphviz,
   texliveMinimal,
   dblatexFull,
   libxslt,
-  w3m,
+  w3m-batch,
   lynx,
   imagemagick,
   lilypond,
@@ -45,11 +44,7 @@
   enableQrcodeFilter ? false,
   qrencode,
   enableMatplotlibFilter ? false,
-  matplotlib,
-  numpy,
   enableAafigureFilter ? false,
-  aafigure,
-  recursive-pth-loader,
   # backends
   enableDeckjsBackend ? false,
   enableOdfBackend ? false,
@@ -61,6 +56,13 @@
 }:
 
 let
+  inherit (python3.pkgs)
+    pygments
+    matplotlib
+    numpy
+    aafigure
+    recursive-pth-loader
+    ;
 
   _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter;
   _enableMscgenFilter = enableExtraPlugins || enableMscgenFilter;
@@ -268,7 +270,7 @@ python3.pkgs.buildPythonApplication rec {
             -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
             -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
             ${lib.optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \
-            -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
+            -e "s|^W3M =.*|W3M = '${w3m-batch}/bin/w3m'|" \
             -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
             -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
             -e "s|^EPUBCHECK =.*|EPUBCHECK = '${epubcheck}/bin/epubcheck'|" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67e9fd205a71..36452040c0a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1978,18 +1978,6 @@ with pkgs;
 
   apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { };
 
-  asciidoc = callPackage ../tools/typesetting/asciidoc {
-    inherit (python3.pkgs)
-      pygments
-      matplotlib
-      numpy
-      aafigure
-      recursive-pth-loader
-      ;
-    w3m = w3m-batch;
-    enableStandardFeatures = false;
-  };
-
   asciidoc-full = asciidoc.override {
     enableStandardFeatures = true;
   };