From 75a3ce9316a845985a51c3640f03196751d4036e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 20 Jun 2023 19:53:10 +0300 Subject: [PATCH] maven: remove builder.sh This commit also drops support for Maven 1.x. --- .../build-managers/apache-maven/builder.sh | 19 ----------- .../build-managers/apache-maven/default.nix | 33 ++++++++++++++----- 2 files changed, 25 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/apache-maven/builder.sh diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh deleted file mode 100644 index 96fe8ebfac29..000000000000 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi -source $stdenv/setup - -unpackPhase - -mkdir -p $out/maven -cp -r $name/* $out/maven - -makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk" -makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug --set-default JAVA_HOME "$jdk" - -# Add the maven-axis and JIRA plugin by default when using maven 1.x -if [ -e $out/maven/bin/maven ] -then - export OLD_HOME=$HOME - export HOME=. - $out/maven/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7 - export HOME=OLD_HOME -fi diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index c6a42aaaef1c..a32d12a35514 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -1,21 +1,38 @@ -{ lib, stdenv, fetchurl, jdk, makeWrapper }: +{ lib +, stdenvNoCC +, fetchurl +, jdk +, makeWrapper +}: assert jdk != null; -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "apache-maven"; version = "3.9.2"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-gJ7zIgxtF5GVwGwyTLmm002Oy6Vmxc/Y64MWe8A0EX0="; + url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz"; + hash = "sha256-gJ7zIgxtF5GVwGwyTLmm002Oy6Vmxc/Y64MWe8A0EX0="; }; + sourceRoot = "."; + nativeBuildInputs = [ makeWrapper ]; - inherit jdk; + installPhase = '' + runHook preInstall + + mkdir -p $out/maven + cp -r ${finalAttrs.pname}-${finalAttrs.version}/* $out/maven + + makeWrapper $out/maven/bin/mvn $out/bin/mvn \ + --set-default JAVA_HOME "${jdk}" + makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \ + --set-default JAVA_HOME "${jdk}" + + runHook postInstall + ''; meta = with lib; { mainProgram = "mvn"; @@ -25,4 +42,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ cko ]; }; -} +})