Merge pull request #326566 from SuperSandro2000/maven-nox

pkgs/applications/science/misc/gephi/default.nix

@@ -1,11 +1,6 @@
 { lib, fetchFromGitHub, jdk11, maven, jogl }:
 
-let
-  mavenJdk11 = maven.override {
-    jdk = jdk11;
-  };
-in
-mavenJdk11.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "gephi";
   version = "0.10.1";
 
@@ -16,6 +11,7 @@ mavenJdk11.buildMavenPackage rec {
     hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4=";
   };
 
+  mvnJdk = jdk11;
   mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg=";
 
   nativeBuildInputs = [ jdk11 ];

pkgs/applications/science/misc/openrefine/default.nix

@@ -7,14 +7,9 @@
 , jq
 , makeWrapper
 , maven
-, writeText
 }:
 
 let
-  maven' = maven.override {
-    inherit jdk;
-  };
-
   version = "3.8.1";
   src = fetchFromGitHub {
     owner = "openrefine";
@@ -47,7 +42,7 @@ let
     '';
   };
 
-in maven'.buildMavenPackage {
+in maven.buildMavenPackage {
   inherit src version;
 
   pname = "openrefine";
@@ -55,6 +50,8 @@ in maven'.buildMavenPackage {
   postPatch = ''
     cp -r ${npmPkg} main/webapp/modules/core/3rdparty
   '';
+
+  mvnJdk = jdk;
   mvnParameters = "-pl !packaging";
   mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ=";
 

pkgs/by-name/ma/maven/build-maven-package.nix

@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, jdk
 , maven
 }:
 
@@ -10,6 +11,7 @@
 , patches ? [ ]
 , pname
 , version
+, mvnJdk ? jdk
 , mvnHash ? ""
 , mvnFetchExtraArgs ? { }
 , mvnDepsParameters ? ""
@@ -32,6 +34,8 @@ let
       maven
     ] ++ args.nativeBuildInputs or [ ];
 
+    JAVA_HOME = mvnJdk;
+
     buildPhase = ''
       runHook preBuild
     '' + lib.optionalString buildOffline ''
@@ -83,6 +87,8 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // {
     maven
   ];
 
+  JAVA_HOME = mvnJdk;
+
   buildPhase = ''
     runHook preBuild
 

pkgs/by-name/ma/maven/package.nix

@@ -2,13 +2,13 @@
   lib,
   callPackage,
   fetchurl,
-  jdk,
+  jdk_headless,
   makeWrapper,
   stdenvNoCC,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "apache-maven";
+  pname = "maven";
   version = "3.9.8";
 
   src = fetchurl {
@@ -27,9 +27,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     cp -r apache-maven-${finalAttrs.version}/* $out/maven
 
     makeWrapper $out/maven/bin/mvn $out/bin/mvn \
-      --set-default JAVA_HOME "${jdk}"
+      --set-default JAVA_HOME "${jdk_headless}"
     makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \
-      --set-default JAVA_HOME "${jdk}"
+      --set-default JAVA_HOME "${jdk_headless}"
 
     runHook postInstall
   '';
@@ -55,6 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "mvn";
     maintainers = with lib.maintainers; [ ];
-    inherit (jdk.meta) platforms;
+    inherit (jdk_headless.meta) platforms;
   };
 })

pkgs/by-name/pr/protege/package.nix

@@ -8,10 +8,7 @@
 , maven
 }:
 
-let
-  mvn = maven.override { jdk = jdk11; };
-in
-mvn.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "protege";
   version = "5.6.4";
 
@@ -22,6 +19,7 @@ mvn.buildMavenPackage rec {
     hash = "sha256-Q3MHa7nCeF31n7JPltcemFBc/sJwGA9Ev0ymjQhY/U0=";
   };
 
+  mvnJdk = jdk11;
   mvnHash = "sha256-kemP2gDv1CYuaoK0fwzBxdLTusarPasf2jCDQj/HPYE=";
 
   patches = [

pkgs/by-name/qu/quark-goldleaf/package.nix

@@ -12,9 +12,8 @@
 
 let
   jdk' = jdk.override { enableJavaFX = true; };
-  maven' = maven.override { jdk = jdk'; };
 in
-maven'.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "quark-goldleaf";
   version = "1.0.0";
 
@@ -38,6 +37,7 @@ maven'.buildMavenPackage rec {
     })
   ];
 
+  mvnJdk = jdk';
   mvnHash = "sha256-gA3HsQZFa2POP9cyJLb1l8t3hrJYzDowhJU+5Xl79p4=";
 
   # set fixed build timestamp for deterministic jar

pkgs/by-name/so/sonarlint-ls/package.nix

@@ -14,10 +14,7 @@
 , gnused
 }:
 
-let
-  mavenJdk17 = maven.override { jdk = jdk17; };
-in
-mavenJdk17.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "sonarlint-ls";
   version = "3.5.1.75119";
 
@@ -28,6 +25,7 @@ mavenJdk17.buildMavenPackage rec {
     hash = "sha256-6tbuX0wUpqbTyM44e7PqZHL0/XjN8hTFCgfzV+qc1m0=";
   };
 
+  mvnJdk = jdk17;
   manualMvnArtifacts = [
     "org.apache.maven.surefire:surefire-junit-platform:3.1.2"
     "org.junit.platform:junit-platform-launcher:1.8.2"

pkgs/by-name/ti/tika/package.nix

@@ -12,8 +12,6 @@
 }:
 
 let
-  maven' = maven.override { jdk = jdk8; };
-
   mvnDepsHashes = {
     "x86_64-linux" = "sha256-M8O1EJtlTm+mVy/qxapRcBWxD14eYL/LLUxP2uOBoM4=";
     "aarch64-linux" = "sha256-+ewdV9g0MfgiBiRAimkIZp9lrOTKnKnBB1LqhIlOSaQ=";
@@ -25,7 +23,7 @@ let
     mvnDepsHashes.${stdenv.system}
       or (lib.warn "This platform doesn't have a default mvnDepsHash value, you'll need to specify it manually" lib.fakeHash);
 in
-maven'.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "tika";
   version = "2.9.2";
 
@@ -45,6 +43,7 @@ maven'.buildMavenPackage rec {
     "org.junit.platform:junit-platform-launcher:1.10.0"
   ];
 
+  mvnJdk = jdk8;
   mvnHash = if mvnDepsHash != null then mvnDepsHash else knownMvnDepsHash;
 
   mvnParameters = toString [

pkgs/development/tools/global-platform-pro/default.nix

@@ -1,10 +1,6 @@
 { lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }:
 
 let
-  mavenJdk8 = maven.override {
-    jdk = jdk8;
-  };
-
   defineMvnWrapper = ''
     mvn()
     {
@@ -16,7 +12,7 @@ let
     }
   '';
 in
-mavenJdk8.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "global-platform-pro";
   version = "20.01.23";
   GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty
@@ -28,6 +24,7 @@ mavenJdk8.buildMavenPackage rec {
     sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY=";
   };
 
+  mvnJdk = jdk8;
   mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A=";
 
   nativeBuildInputs = [ jdk8 makeWrapper ];

pkgs/development/tools/scenebuilder/default.nix

@@ -13,11 +13,8 @@ let
   jdk = jdk21.override {
     enableJavaFX = true;
   };
-  maven' = maven.override {
-    inherit jdk;
-  };
 in
-maven'.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "scenebuilder";
   version = "21.0.1";
 
@@ -42,6 +39,7 @@ maven'.buildMavenPackage rec {
         --replace-fail "\''${maven.build.timestamp}" "$(date -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')"
   '';
 
+  mvnJdk = jdk;
   mvnParameters = toString [
     "-Dmaven.test.skip"
     "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"

pkgs/games/runelite/default.nix

@@ -10,12 +10,7 @@
 , libGL
 }:
 
-let
-  mavenJdk17 = maven.override {
-    jdk = jdk17;
-  };
-in
-mavenJdk17.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "runelite";
   version = "2.7.1";
 
@@ -25,6 +20,8 @@ mavenJdk17.buildMavenPackage rec {
     rev = version;
     hash = "sha256-7T9n23qMl4IJQL7yWLXKvRzYcMeXDUwkY8MBFc2t3Rw=";
   };
+
+  mvnJdk = jdk17;
   mvnHash = "sha256-FpfHtGIfo84z6v9/nzc47+JeIM43MR9mWhVOPSi0xhM=";
 
   desktop = makeDesktopItem {

pkgs/tools/games/slipstream/default.nix

@@ -1,8 +1,6 @@
 { lib, fetchFromGitHub, makeWrapper, maven, jdk }:
-let
-  mavenWithJdk = maven.override { inherit jdk; };
-in
-mavenWithJdk.buildMavenPackage rec {
+
+maven.buildMavenPackage rec {
   pname = "slipstream";
   version = "1.9.1";
 
@@ -13,6 +11,7 @@ mavenWithJdk.buildMavenPackage rec {
     hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU=";
   };
 
+  mvnJdk = jdk;
   mvnHash = "sha256-woOSkF5TuzaJ84EndryMoXTMbbK/V/BShM1k+WB8D/c=";
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/tools/security/cryptomator/default.nix

@@ -1,18 +1,11 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, fetchFromGitHub
 , autoPatchelfHook
 , fuse3
 , maven, jdk, makeShellWrapper, glib, wrapGAppsHook3
 , libayatana-appindicator
 }:
 
-
-let
-  mavenJdk = maven.override {
-    jdk = jdk;
-  };
-in
-assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'`
-mavenJdk.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "cryptomator";
   version = "1.13.0";
 
@@ -23,6 +16,7 @@ mavenJdk.buildMavenPackage rec {
     hash = "sha256-aKj8/yQzNWWV2m+sF2Or59OyPMiBqPeXEHn88w2VUkU=";
   };
 
+  mvnJdk = jdk;
   mvnParameters = "-Dmaven.test.skip=true -Plinux";
   mvnHash = "sha256-bZGTYkxRXgjGoxAdVkgiZZgVSghKz3Mq9pCBdivMNPQ=";