diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 03748be76a1..38b0e6391bf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -40,8 +40,6 @@ mapAliases (rec { ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 ammonite-repl = ammonite; # added 2017-05-02 - apacheAnt = ant; # added 2018-04-25 - apacheAnt_1_9 = ant_1_9; # added 2018-04-25 arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 @@ -172,7 +170,6 @@ mapAliases (rec { lua5_sec = luaPackages.luasec; # added 2017-05-02 lzma = xz; # added 2018-04-25 m3d-linux = m33-linux; # added 2016-08-13 - gnum4 = m4; # added 2018-04-25 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 midoriWrapper = midori; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4df5ae360..1c81cc59d2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7471,9 +7471,9 @@ with pkgs; antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; antlr4 = antlr4_7; - ant = callPackage ../development/tools/build-managers/apache-ant { }; - - ant_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; + apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; + apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; + ant = apacheAnt; apacheKafka_1_0 = apacheKafka.override { majorVersion = "1.0"; }; apacheKafka_0_9 = apacheKafka.override { majorVersion = "0.9"; }; @@ -7851,7 +7851,8 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; - m4 = callPackage ../development/tools/misc/gnum4 { }; + gnum4 = callPackage ../development/tools/misc/gnum4 { }; + m4 = gnum4; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382;