From a2ab68ab9263224bb01b92a62852ef741dd6880f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:29:33 -0300 Subject: [PATCH] buildMavenPackage: add doCheck support --- .../tools/build-managers/apache-maven/build-package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/build-package.nix b/pkgs/development/tools/build-managers/apache-maven/build-package.nix index df5d67cb42e6..f9ff54696dfe 100644 --- a/pkgs/development/tools/build-managers/apache-maven/build-package.nix +++ b/pkgs/development/tools/build-managers/apache-maven/build-package.nix @@ -6,6 +6,7 @@ { src , sourceRoot ? null , buildOffline ? false +, doCheck ? true , patches ? [ ] , pname , version @@ -22,6 +23,7 @@ # created to allow using maven packages in the same style as rust let + mvnSkipTests = lib.optionalString (!doCheck) "-DskipTests"; fetchedMavenDeps = stdenv.mkDerivation ({ name = "${pname}-${version}-maven-deps"; inherit src sourceRoot patches; @@ -49,7 +51,7 @@ let mvn dependency:sources -DincludeGroupIds="$group" -DincludeArtifactIds="$artifact" -Dmaven.repo.local=$out/.m2 done '' + lib.optionalString (!buildOffline) '' - mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters} + mvn package -Dmaven.repo.local=$out/.m2 ${mvnSkipTests} ${mvnParameters} '' + '' runHook postBuild ''; @@ -85,7 +87,7 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // { runHook preBuild mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd) - mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnParameters} + mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters} runHook postBuild '';