From 4f2b642f6cff15be166a11251f3cb7b46f5c443f Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 29 Nov 2024 01:06:14 +0000 Subject: [PATCH 1/4] apacheAnt: make ant the primary name apacheAnt is unused in the tree; `ant` is more commonly used. --- .github/labeler.yml | 2 +- pkgs/by-name/{ap/apacheAnt => an/ant}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/by-name/{ap/apacheAnt => an/ant}/package.nix (100%) diff --git a/.github/labeler.yml b/.github/labeler.yml index 34da4f3c8f43f..6384e13bdbfc3 100644 --- a/.github/labeler.yml +++ b/.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 diff --git a/pkgs/by-name/ap/apacheAnt/package.nix b/pkgs/by-name/an/ant/package.nix similarity index 100% rename from pkgs/by-name/ap/apacheAnt/package.nix rename to pkgs/by-name/an/ant/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4ff2d475eeb2..6fdda136f76da 100644 --- a/pkgs/top-level/aliases.nix +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e806f98b32b0..a4915e277edb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 From 2538d58436b8d0b56d29780aeebf4bf720ddb9ea Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 29 Nov 2024 01:08:54 +0000 Subject: [PATCH 2/4] ant: format with nixfmt-rfc-style Also: * Remove a stray unused comment --- pkgs/by-name/an/ant/package.nix | 130 +++++++++++++++++--------------- 1 file changed, 68 insertions(+), 62 deletions(-) diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix index 785a518edd3b1..ad79b1388b6f9 100644 --- a/pkgs/by-name/an/ant/package.nix +++ b/pkgs/by-name/an/ant/package.nix @@ -1,4 +1,11 @@ -{ fetchurl, lib, stdenv, coreutils, makeWrapper, gitUpdater }: +{ + fetchurl, + lib, + stdenv, + coreutils, + makeWrapper, + gitUpdater, +}: stdenv.mkDerivation rec { pname = "ant"; @@ -16,67 +23,66 @@ stdenv.mkDerivation rec { sha256 = "1l8say86bz9gxp4yy777z7nm4j6m905pg342li1aphc14p5grvwn"; }; - installPhase = - '' - mkdir -p $out/bin $out/lib/ant - mv * $out/lib/ant/ - - # Get rid of the manual (35 MiB). Maybe we should put this in a - # separate output. Keep the antRun script since it's vanilla sh - # and needed for the task (but since we set ANT_HOME to - # a weird value, we have to move antRun to a weird location). - # Get rid of the other Ant scripts since we provide our own. - mv $out/lib/ant/bin/antRun $out/bin/ - rm -rf $out/lib/ant/{manual,bin,WHATSNEW} - mkdir $out/lib/ant/bin - mv $out/bin/antRun $out/lib/ant/bin/ - - # Install ant-contrib. - unpackFile $contrib - cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ - - cat >> $out/bin/ant <&2 - exit 1 - fi - fi - - if [ -z \$NIX_JVM ]; then - if [ -e \$JAVA_HOME/bin/java ]; then - NIX_JVM=\$JAVA_HOME/bin/java - elif [ -e \$JAVA_HOME/bin/gij ]; then - NIX_JVM=\$JAVA_HOME/bin/gij - else - NIX_JVM=java - fi - fi - - LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" - - exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ - -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ - org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ - -cp "\$CLASSPATH" "\$@" - EOF - - chmod +x $out/bin/ant - ''; # */ + installPhase = '' + mkdir -p $out/bin $out/lib/ant + mv * $out/lib/ant/ + + # Get rid of the manual (35 MiB). Maybe we should put this in a + # separate output. Keep the antRun script since it's vanilla sh + # and needed for the task (but since we set ANT_HOME to + # a weird value, we have to move antRun to a weird location). + # Get rid of the other Ant scripts since we provide our own. + mv $out/lib/ant/bin/antRun $out/bin/ + rm -rf $out/lib/ant/{manual,bin,WHATSNEW} + mkdir $out/lib/ant/bin + mv $out/bin/antRun $out/lib/ant/bin/ + + # Install ant-contrib. + unpackFile $contrib + cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ + + cat >> $out/bin/ant <&2 + exit 1 + fi + fi + + if [ -z \$NIX_JVM ]; then + if [ -e \$JAVA_HOME/bin/java ]; then + NIX_JVM=\$JAVA_HOME/bin/java + elif [ -e \$JAVA_HOME/bin/gij ]; then + NIX_JVM=\$JAVA_HOME/bin/gij + else + NIX_JVM=java + fi + fi + + LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" + + exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ + -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ + org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ + -cp "\$CLASSPATH" "\$@" + EOF + + chmod +x $out/bin/ant + ''; passthru = { updateScript = gitUpdater { From acf1b4900e58af3b914fc491e7e62a1dfffca5a1 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 29 Nov 2024 01:11:06 +0000 Subject: [PATCH 3/4] .git-blame-ignore-revs: add 2538d58436b8d0b56d29780aeebf4bf720ddb9ea --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 05ce9aec0135c..86415c860b425 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -204,5 +204,8 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b # sqlc: format with nixfmt 2bdec131b2bb2c8563f4556d741d34ccb77409e2 +# ant: format with nixfmt-rfc-style +2538d58436b8d0b56d29780aeebf4bf720ddb9ea + # treewide: migrate packages to pkgs/by-name, take 1 571c71e6f73af34a229414f51585738894211408 From 0b87b1feb6024e4ebcc4ad259c4eb1a43e867833 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 29 Nov 2024 01:11:06 +0000 Subject: [PATCH 4/4] ant: use finalAttrs --- pkgs/by-name/an/ant/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix index ad79b1388b6f9..bedaa9b139494 100644 --- a/pkgs/by-name/an/ant/package.nix +++ b/pkgs/by-name/an/ant/package.nix @@ -7,14 +7,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ant"; version = "1.10.15"; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { - url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; + url = "mirror://apache/ant/binaries/apache-ant-${finalAttrs.version}-bin.tar.bz2"; hash = "sha256-h/SNGLoRwRVojDfvl1g+xv+J6mAz+J2BimckjaRxDEs="; }; @@ -122,4 +122,4 @@ stdenv.mkDerivation rec { maintainers = [ ] ++ lib.teams.java.members; platforms = lib.platforms.all; }; -} +})