From 8b1530b937c6d1a82bddaa1594b31558921ab98e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 2 Jun 2024 20:11:05 -0300 Subject: [PATCH 1/4] buildMaven: migrate to apache-maven subdirectory And expose it via passthru --- .../tools/build-managers/apache-maven}/build-maven.nix | 0 .../tools/build-managers/apache-maven/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 7 +++---- 3 files changed, 10 insertions(+), 6 deletions(-) rename pkgs/{build-support => development/tools/build-managers/apache-maven}/build-maven.nix (100%) diff --git a/pkgs/build-support/build-maven.nix b/pkgs/development/tools/build-managers/apache-maven/build-maven.nix similarity index 100% rename from pkgs/build-support/build-maven.nix rename to pkgs/development/tools/build-managers/apache-maven/build-maven.nix diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index c8b5fdaa04a9..388973782e53 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -35,8 +35,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.buildMavenPackage = callPackage ./build-package.nix { - maven = finalAttrs.finalPackage; + passthru = { + buildMaven = callPackage ./build-maven.nix { + maven = finalAttrs.finalPackage; + }; + buildMavenPackage = callPackage ./build-package.nix { + maven = finalAttrs.finalPackage; + }; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fafc9d1ef52b..94088ad427b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -403,8 +403,6 @@ with pkgs; buildFHSEnvChroot = callPackage ../build-support/build-fhsenv-chroot { }; # Deprecated; use buildFHSEnv/buildFHSEnvBubblewrap buildFHSEnvBubblewrap = callPackage ../build-support/build-fhsenv-bubblewrap { }; - buildMaven = callPackage ../build-support/build-maven.nix { }; - c64-debugger = callPackage ../applications/emulators/c64-debugger { }; camunda-modeler = callPackage ../applications/misc/camunda-modeler { }; @@ -19058,8 +19056,9 @@ with pkgs; math-preview = callPackage ../tools/text/math-review { }; - maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + maven3 = maven; + maven = callPackage ../development/tools/build-managers/apache-maven { }; + inherit (maven) buildMaven; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; From d1402093675d1314f86cce1471cb3d2ffa22c08d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 2 Jun 2024 20:15:40 -0300 Subject: [PATCH 2/4] maven: migrate to by-name --- .../apache-maven => by-name/ma/maven}/build-maven.nix | 0 .../apache-maven => by-name/ma/maven}/build-package.nix | 0 .../apache-maven/default.nix => by-name/ma/maven/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 deletion(-) rename pkgs/{development/tools/build-managers/apache-maven => by-name/ma/maven}/build-maven.nix (100%) rename pkgs/{development/tools/build-managers/apache-maven => by-name/ma/maven}/build-package.nix (100%) rename pkgs/{development/tools/build-managers/apache-maven/default.nix => by-name/ma/maven/package.nix} (100%) diff --git a/pkgs/development/tools/build-managers/apache-maven/build-maven.nix b/pkgs/by-name/ma/maven/build-maven.nix similarity index 100% rename from pkgs/development/tools/build-managers/apache-maven/build-maven.nix rename to pkgs/by-name/ma/maven/build-maven.nix diff --git a/pkgs/development/tools/build-managers/apache-maven/build-package.nix b/pkgs/by-name/ma/maven/build-package.nix similarity index 100% rename from pkgs/development/tools/build-managers/apache-maven/build-package.nix rename to pkgs/by-name/ma/maven/build-package.nix diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/by-name/ma/maven/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/apache-maven/default.nix rename to pkgs/by-name/ma/maven/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94088ad427b5..fbe1bc67dce8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19057,7 +19057,6 @@ with pkgs; math-preview = callPackage ../tools/text/math-review { }; maven3 = maven; - maven = callPackage ../development/tools/build-managers/apache-maven { }; inherit (maven) buildMaven; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; From b63689ed2a2f2c7c5a5e7de568e3373e1a306d8c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 2 Jun 2024 20:21:35 -0300 Subject: [PATCH 3/4] maven: rename build-package.nix to build-maven-package.nix --- .../ma/maven/{build-package.nix => build-maven-package.nix} | 0 pkgs/by-name/ma/maven/package.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/by-name/ma/maven/{build-package.nix => build-maven-package.nix} (100%) diff --git a/pkgs/by-name/ma/maven/build-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix similarity index 100% rename from pkgs/by-name/ma/maven/build-package.nix rename to pkgs/by-name/ma/maven/build-maven-package.nix diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index 388973782e53..c32972dac1e7 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildMaven = callPackage ./build-maven.nix { maven = finalAttrs.finalPackage; }; - buildMavenPackage = callPackage ./build-package.nix { + buildMavenPackage = callPackage ./build-maven-package.nix { maven = finalAttrs.finalPackage; }; }; From 0fb204103940dc4ec7d0b1e604b832883cabcc1f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 2 Jun 2024 20:26:09 -0300 Subject: [PATCH 4/4] maven: cosmetic reword - align input set - remove jdk assertion - remove references to pname - get rid of nested with - meta.longDescription - meta.platforms --- pkgs/by-name/ma/maven/package.nix | 37 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index c32972dac1e7..7856cadcfa94 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -1,19 +1,18 @@ -{ lib -, stdenvNoCC -, fetchurl -, jdk -, makeWrapper -, callPackage +{ + lib, + callPackage, + fetchurl, + jdk, + makeWrapper, + stdenvNoCC, }: -assert jdk != null; - stdenvNoCC.mkDerivation (finalAttrs: { pname = "apache-maven"; version = "3.9.6"; src = fetchurl { - url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz"; + url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz"; hash = "sha256-bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks="; }; @@ -25,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/maven - cp -r ${finalAttrs.pname}-${finalAttrs.version}/* $out/maven + cp -r apache-maven-${finalAttrs.version}/* $out/maven makeWrapper $out/maven/bin/mvn $out/bin/mvn \ --set-default JAVA_HOME "${jdk}" @@ -44,12 +43,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; }; - meta = with lib; { - mainProgram = "mvn"; - description = "Build automation tool (used primarily for Java projects)"; + meta = { homepage = "https://maven.apache.org/"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ cko ]; + description = "Build automation tool (used primarily for Java projects)"; + longDescription = '' + Apache Maven is a software project management and comprehension + tool. Based on the concept of a project object model (POM), Maven can + manage a project's build, reporting and documentation from a central piece + of information. + ''; + license = lib.licenses.asl20; + mainProgram = "mvn"; + maintainers = with lib.maintainers; [ cko ]; + inherit (jdk.meta) platforms; }; })