From 6061c5123ac1703a455ab7631b17da9f28fc7b6e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 29 Oct 2025 18:33:29 +0200
Subject: [PATCH 1/2] asciidoctor: move to by-name

---
 pkgs/{tools/typesetting => by-name/as}/asciidoctor/Gemfile      | 0
 pkgs/{tools/typesetting => by-name/as}/asciidoctor/Gemfile.lock | 0
 pkgs/{tools/typesetting => by-name/as}/asciidoctor/gemset.nix   | 0
 .../default.nix => by-name/as/asciidoctor/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor/Gemfile (100%)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor/Gemfile.lock (100%)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor/gemset.nix (100%)
 rename pkgs/{tools/typesetting/asciidoctor/default.nix => by-name/as/asciidoctor/package.nix} (100%)

diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/by-name/as/asciidoctor/Gemfile
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/Gemfile
rename to pkgs/by-name/as/asciidoctor/Gemfile
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/by-name/as/asciidoctor/Gemfile.lock
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/Gemfile.lock
rename to pkgs/by-name/as/asciidoctor/Gemfile.lock
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/by-name/as/asciidoctor/gemset.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/gemset.nix
rename to pkgs/by-name/as/asciidoctor/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/by-name/as/asciidoctor/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/default.nix
rename to pkgs/by-name/as/asciidoctor/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f38323f85cb8..8bd0575e7cc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2299,8 +2299,6 @@ with pkgs;
     enableExtraPlugins = true;
   };
 
-  asciidoctor = callPackage ../tools/typesetting/asciidoctor { };
-
   asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
 
   b2sum = callPackage ../tools/security/b2sum {

From 001cb3b681f82b74ebb98abacfbba2f9f1a881dd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 29 Oct 2025 18:34:10 +0200
Subject: [PATCH 2/2] asciidoctor-with-extensions: move to by-name

---
 .../as}/asciidoctor-with-extensions/Gemfile                     | 0
 .../as}/asciidoctor-with-extensions/Gemfile.lock                | 0
 .../as}/asciidoctor-with-extensions/gemset.nix                  | 0
 .../as/asciidoctor-with-extensions/package.nix}                 | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor-with-extensions/Gemfile (100%)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor-with-extensions/Gemfile.lock (100%)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor-with-extensions/gemset.nix (100%)
 rename pkgs/{tools/typesetting/asciidoctor-with-extensions/default.nix => by-name/as/asciidoctor-with-extensions/package.nix} (100%)

diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile
rename to pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
rename to pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
rename to pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/by-name/as/asciidoctor-with-extensions/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
rename to pkgs/by-name/as/asciidoctor-with-extensions/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bd0575e7cc6..3de7756e4209 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2299,8 +2299,6 @@ with pkgs;
     enableExtraPlugins = true;
   };
 
-  asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
-
   b2sum = callPackage ../tools/security/b2sum {
     inherit (llvmPackages) openmp;
   };