gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mvnd: 1.0.2 -> 1.0.3

Browse Source
This commit is contained in:
Nathan Regner
2025-09-18 16:42:49 -06:00
parent ec76f79ad2
commit db173f4a35
2 changed files with 21 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/by-name/mv/mvnd/package.nix
View File

@@ -1,8 +1,8 @@
{
lib,
fetchFromGitHub,
graalvmPackages,
installShellFiles,
lib,
makeWrapper,
maven,
mvnd,
@@ -24,18 +24,17 @@ in
maven.buildMavenPackage rec {
pname = "mvnd";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "apache";
repo = "maven-mvnd";
rev = version;
sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU=";
sha256 = "sha256-vlJG2uDY93iri1X7SYPRufAIN4fhAjCd8gCeCdz/QDE=";
};
patches = [ ./patches/0001-update-groovy-for-compatibility-with-Java-24.patch ];
# need graalvm at build-time for the `native-image` tool
mvnJdk = graalvmPackages.graalvm-ce;
mvnHash = "sha256-/Ful6v3hfm+0aa0vBQhqMK6VE+93L3o7pwZ6wmeXzQY=";
mvnHash = "sha256-n6ZKEXDzyzMfUZt3WHkwCDB68gm30UGrFecffFy7ytA=";
nativeBuildInputs = [
graalvmPackages.graalvm-ce
@@ -44,22 +43,25 @@ maven.buildMavenPackage rec {
];
mvnDepsParameters = mvnParameters;
mvnParameters = lib.concatStringsSep " " [
"-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
"-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream
"-Dspotless.skip=true" # skip formatting checks
mvnParameters = lib.concatStringsSep " " (
[
"-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
"-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream
"-Dspotless.skip=true" # skip formatting checks
# skip tests that fail in the sandbox
"-pl"
"!integration-tests"
"-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest"
"-Dsurefire.failIfNoSpecifiedTests=false"
# skip tests that fail in the sandbox
"-pl"
"!integration-tests"
"-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest,!org.mvndaemon.mvnd.client.NoDaemonTest"
"-Dsurefire.failIfNoSpecifiedTests=false"
"-Pnative"
# propagate linker args required by the darwin build
# see `buildGraalvmNativeImage`
''-Dgraalvm-native-static-opt="-H:-CheckToolchain $(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)"''
];
"-Pnative"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# see `buildGraalvmNativeImage`
"-DbuildArgs=-H:-CheckToolchain"
]
);
installPhase = ''
runHook preInstall

34
pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch
View File

@@ -1,34 +0,0 @@
From 4d92b26f6cfc7c5f164caf11c1d5325815058624 Mon Sep 17 00:00:00 2001
From: Nathan Regner <nathanregner@gmail.com>
Date: Fri, 16 May 2025 23:28:13 -0600
Subject: [PATCH] build: update groovy for compatibility with Java 24
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c1cec38b..7534ffd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
<graalvm.version>24.0.2</graalvm.version>
<graalvm.plugin.version>0.10.2</graalvm.plugin.version>
- <groovy.version>4.0.22</groovy.version>
+ <groovy.version>4.0.24</groovy.version>
<jakarta.inject.version>1.0</jakarta.inject.version>
<jline.version>3.26.3</jline.version>
<maven.version>3.9.9</maven.version>
@@ -91,7 +91,7 @@
<!-- plugin versions a..z -->
<buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
- <groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
+ <groovy-maven-plugin.version>4.2.0</groovy-maven-plugin.version>
<mrm.version>1.6.0</mrm.version>
<junit-platform-launcher.version>1.10.3</junit-platform-launcher.version>
<takari-provisio.version>1.0.25</takari-provisio.version>
--
2.49.0