pyrox.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
lol
fork
Configure Feed
Select the types of activity you want to include in your feed.
mvnd: 1.0.2 -> 1.0.3
+21
-53
+21
-19
pkgs/by-name/mv/mvnd/package.nix
+21
-19
pkgs/by-name/mv/mvnd/package.nix
···
1
1
{
2
+
lib,
2
3
fetchFromGitHub,
3
4
graalvmPackages,
4
5
installShellFiles,
5
-
lib,
6
6
makeWrapper,
7
7
maven,
8
8
mvnd,
···
24
24
25
25
maven.buildMavenPackage rec {
26
26
pname = "mvnd";
27
-
version = "1.0.2";
27
+
version = "1.0.3";
28
28
src = fetchFromGitHub {
29
29
owner = "apache";
30
30
repo = "maven-mvnd";
31
31
rev = version;
32
-
sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU=";
32
+
sha256 = "sha256-vlJG2uDY93iri1X7SYPRufAIN4fhAjCd8gCeCdz/QDE=";
33
33
};
34
-
patches = [ ./patches/0001-update-groovy-for-compatibility-with-Java-24.patch ];
35
34
36
35
# need graalvm at build-time for the `native-image` tool
37
36
mvnJdk = graalvmPackages.graalvm-ce;
38
-
mvnHash = "sha256-/Ful6v3hfm+0aa0vBQhqMK6VE+93L3o7pwZ6wmeXzQY=";
37
+
mvnHash = "sha256-n6ZKEXDzyzMfUZt3WHkwCDB68gm30UGrFecffFy7ytA=";
39
38
40
39
nativeBuildInputs = [
41
40
graalvmPackages.graalvm-ce
···
44
43
];
45
44
46
45
mvnDepsParameters = mvnParameters;
47
-
mvnParameters = lib.concatStringsSep " " [
48
-
"-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
49
-
"-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream
50
-
"-Dspotless.skip=true" # skip formatting checks
46
+
mvnParameters = lib.concatStringsSep " " (
47
+
[
48
+
"-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
49
+
"-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream
50
+
"-Dspotless.skip=true" # skip formatting checks
51
51
52
-
# skip tests that fail in the sandbox
53
-
"-pl"
54
-
"!integration-tests"
55
-
"-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest"
56
-
"-Dsurefire.failIfNoSpecifiedTests=false"
52
+
# skip tests that fail in the sandbox
53
+
"-pl"
54
+
"!integration-tests"
55
+
"-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest,!org.mvndaemon.mvnd.client.NoDaemonTest"
56
+
"-Dsurefire.failIfNoSpecifiedTests=false"
57
57
58
-
"-Pnative"
59
-
# propagate linker args required by the darwin build
60
-
# see `buildGraalvmNativeImage`
61
-
''-Dgraalvm-native-static-opt="-H:-CheckToolchain $(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)"''
62
-
];
58
+
"-Pnative"
59
+
]
60
+
++ lib.optionals stdenv.hostPlatform.isDarwin [
61
+
# see `buildGraalvmNativeImage`
62
+
"-DbuildArgs=-H:-CheckToolchain"
63
+
]
64
+
);
63
65
64
66
installPhase = ''
65
67
runHook preInstall
-34
pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch
-34
pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch
···
1
-
From 4d92b26f6cfc7c5f164caf11c1d5325815058624 Mon Sep 17 00:00:00 2001
2
-
From: Nathan Regner <nathanregner@gmail.com>
3
-
Date: Fri, 16 May 2025 23:28:13 -0600
4
-
Subject: [PATCH] build: update groovy for compatibility with Java 24
5
-
6
-
---
7
-
pom.xml | 4 ++--
8
-
1 file changed, 2 insertions(+), 2 deletions(-)
9
-
10
-
diff --git a/pom.xml b/pom.xml
11
-
index c1cec38b..7534ffd5 100644
12
-
--- a/pom.xml
13
-
+++ b/pom.xml
14
-
@@ -80,7 +80,7 @@
15
-
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
16
-
<graalvm.version>24.0.2</graalvm.version>
17
-
<graalvm.plugin.version>0.10.2</graalvm.plugin.version>
18
-
- <groovy.version>4.0.22</groovy.version>
19
-
+ <groovy.version>4.0.24</groovy.version>
20
-
<jakarta.inject.version>1.0</jakarta.inject.version>
21
-
<jline.version>3.26.3</jline.version>
22
-
<maven.version>3.9.9</maven.version>
23
-
@@ -91,7 +91,7 @@
24
-
25
-
<!-- plugin versions a..z -->
26
-
<buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
27
-
- <groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
28
-
+ <groovy-maven-plugin.version>4.2.0</groovy-maven-plugin.version>
29
-
<mrm.version>1.6.0</mrm.version>
30
-
<junit-platform-launcher.version>1.10.3</junit-platform-launcher.version>
31
-
<takari-provisio.version>1.0.25</takari-provisio.version>
32
-
--
33
-
2.49.0
34
-