apacheAnt: make ant the primary name

apacheAnt is unused in the tree; `ant` is more commonly used.

.github/labeler.yml

@@ -194,7 +194,7 @@
         - pkgs/by-name/ma/maven/**/*
         - doc/languages-frameworks/maven.section.md
         # Ant
-        - pkgs/by-name/ap/apacheAnt/**/*
+        - pkgs/by-name/an/ant/**/*
         # javaPackages attrset
         - pkgs/development/java-modules/**/*
         - pkgs/top-level/java-packages.nix

pkgs/top-level/aliases.nix

@@ -111,6 +111,7 @@ mapAliases {
   ao = libfive; # Added 2024-10-11
   apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13
   antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
+  apacheAnt = ant; # Added 2024-11-28
   appthreat-depscan = dep-scan; # Added 2024-04-10
   arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07
   aria = aria2; # Added 2024-03-26

pkgs/top-level/all-packages.nix

@@ -7804,8 +7804,6 @@ with pkgs;
 
   antlr = antlr4;
 
-  ant = apacheAnt;
-
   inherit (callPackages ../servers/apache-kafka { })
     apacheKafka_3_6
     apacheKafka_3_7