From 1564f9247e798f63195ddef1510b8d358e2693f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 12 Jul 2024 16:20:33 +0200 Subject: [PATCH 01/14] maven: match pname and package attr --- pkgs/by-name/ma/maven/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index ad591865e293..8919cb1f748b 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -8,7 +8,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { - pname = "apache-maven"; + pname = "maven"; version = "3.9.8"; src = fetchurl { From ab554a96a01e6aaaf90f1c36067d60ed2c978a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:06:43 +0200 Subject: [PATCH 02/14] maven.buildMavenPackage: overwrite jdk version used to download dependencies without rebuilding maven itself --- pkgs/by-name/ma/maven/build-maven-package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index f9ff54696dfe..b398d7ffe83a 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/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 '' From 76dd6ab59a1d10191bdacdbee551557a127e3fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:07:19 +0200 Subject: [PATCH 03/14] tika: stop overwriting maven --- pkgs/by-name/ti/tika/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix index 932cb99a945f..fb178fbd8707 100644 --- a/pkgs/by-name/ti/tika/package.nix +++ b/pkgs/by-name/ti/tika/package.nix @@ -9,8 +9,6 @@ }: let - maven' = maven.override { jdk = jdk8; }; - mvnDepsHashes = { "x86_64-linux" = "sha256-M8O1EJtlTm+mVy/qxapRcBWxD14eYL/LLUxP2uOBoM4="; "aarch64-linux" = "sha256-+ewdV9g0MfgiBiRAimkIZp9lrOTKnKnBB1LqhIlOSaQ="; @@ -22,7 +20,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"; @@ -42,10 +40,11 @@ maven'.buildMavenPackage rec { "org.junit.platform:junit-platform-launcher:1.10.0" ]; + mvnJdk = jdk8; mvnHash = if mvnDepsHash != null then mvnDepsHash else knownMvnDepsHash; mvnParameters = toString [ - "-DskipTests=true" # skip tests (out of memory execptions) + "-DskipTests=true" # skip tests (out of memory exceptions) "-Dossindex.skip" # skip dependency with vulnerability (recommended by upstream) ]; From 6558165366acc058180738d050c2bb90af9ba25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:11:58 +0200 Subject: [PATCH 04/14] gephi: stop overwriting maven --- pkgs/applications/science/misc/gephi/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 77b6584412a5..fe638bde1ba4 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/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 ]; From ba20a2a1ff6a8998d8941b27c665001778906099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:07 +0200 Subject: [PATCH 05/14] openrefine: stop overwriting maven --- pkgs/applications/science/misc/openrefine/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 4f928e727da1..60809a420b39 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/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="; From 3901bffc5351b0bb14bae8ee32b9ce030f9f61dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:13 +0200 Subject: [PATCH 06/14] protege: stop overwriting maven --- pkgs/by-name/pr/protege/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix index f6d22a08e2f5..efb34e4def48 100644 --- a/pkgs/by-name/pr/protege/package.nix +++ b/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 = [ From b7de31a3516c5367ed10b32822cef0eb339a1109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:18 +0200 Subject: [PATCH 07/14] quark-goldleaf: stop overwriting maven --- pkgs/by-name/qu/quark-goldleaf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix index 353bca5fea9f..127ed67b1f3d 100644 --- a/pkgs/by-name/qu/quark-goldleaf/package.nix +++ b/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 From a699e2eeff761db0eececf0409e5aaf0e7ffb07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:31 +0200 Subject: [PATCH 08/14] sonarlint-ls: stop overwriting maven --- pkgs/by-name/so/sonarlint-ls/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index 42b8d6098947..ee3f66b5d9dc 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/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" From 609fcb404d746772ee4cd445a153341002ec8b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:40 +0200 Subject: [PATCH 09/14] global-platform-pro: stop overwriting maven --- pkgs/development/tools/global-platform-pro/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 94186dc643c6..b35cc4998f67 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/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 ]; From e5f3c4c13141a03278d92bd24b36bd842aa8a85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:46 +0200 Subject: [PATCH 10/14] scenebuilder: stop overwriting maven --- pkgs/development/tools/scenebuilder/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index ab80e7693173..7f650a708501 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/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" From 2aa2f1600a2df6b536d5a93efca8ee20af4a56ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:51 +0200 Subject: [PATCH 11/14] runelite: stop overwriting maven --- pkgs/games/runelite/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 22db910b30d2..20fb99f82b7d 100644 --- a/pkgs/games/runelite/default.nix +++ b/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 { From 59d5a65afb5f5c4d4ff2173a10ad6c31ecd97ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:57 +0200 Subject: [PATCH 12/14] slipstream: stop overwriting maven --- pkgs/tools/games/slipstream/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index 522f9ec5d25b..f1fa38f893f8 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/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 ]; From a674dd9f113cac63dad43ae60093bd0c7dbe2712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:13:03 +0200 Subject: [PATCH 13/14] cryptomator: stop overwriting maven --- pkgs/tools/security/cryptomator/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 597c34bf9ae2..38d3aa2a86ba 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/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="; From ea0bc3224593ddf7ac6c702c7acb6c89cf188f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 12 Jul 2024 16:19:03 +0200 Subject: [PATCH 14/14] maven: use headless jdk to avoid GUI dependencies This fixes build with environment.noXlibs enabled. --- pkgs/by-name/ma/maven/build-maven-package.nix | 2 ++ pkgs/by-name/ma/maven/package.nix | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index b398d7ffe83a..3808d40c6f9f 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -87,6 +87,8 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // { maven ]; + JAVA_HOME = mvnJdk; + buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index 8919cb1f748b..19844103ed85 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -2,7 +2,7 @@ lib, callPackage, fetchurl, - jdk, + jdk_headless, makeWrapper, stdenvNoCC, }: @@ -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; }; })