Merge pull request #238764 from wegank/maven-refactor

maven: refactor
2023-06-20 22:11:21 +03:00 · 2023-06-20 22:11:21 +03:00 · f4cb534254
commit f4cb534254
parent 49660fc734 dca415554f
16 changed files with 50 additions and 60 deletions
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@ -16,7 +16,6 @@
 , maven
 , webkitgtk_4_1
 , glib-networking
-, javaPackages
 }:

 let
@ -24,9 +23,7 @@ let
    jdk = jdk17;
  };
 in
-(javaPackages.mavenfod.override {
-  maven = mavenJdk17;
-}) rec {
+mavenJdk17.buildMavenPackage rec {
  pname = "dbeaver";
  version = "22.2.2"; # When updating also update mvnHash

--- a/pkgs/applications/science/electronics/digital/default.nix
+++ b/pkgs/applications/science/electronics/digital/default.nix
@ -1,4 +1,4 @@
-{ lib, javaPackages, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper
+{ lib, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper
 , jre, maven
 }:

@ -27,7 +27,7 @@ let
  # Also use the commit date as a build and output timestamp.
  mvnParameters = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
 in
-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
  pname = "digital";
  inherit version jre;

--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@ -5,9 +5,7 @@ let
    jdk = jdk11;
  };
 in
-(javaPackages.mavenfod.override {
-  maven = mavenJdk11;
-}) rec {
+mavenJdk11.buildMavenPackage rec {
  pname = "gephi";
  version = "0.10.1";

--- a/pkgs/development/tools/build-managers/apache-maven/build-package.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/build-package.nix
--- a/pkgs/development/tools/build-managers/apache-maven/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh
@ -1,19 +0,0 @@
-if [ -e .attrs.sh ]; then source .attrs.sh; fi
-source $stdenv/setup
-
-unpackPhase
-
-mkdir -p $out/maven
-cp -r $name/* $out/maven
-
-makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk"
-makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug --set-default JAVA_HOME "$jdk"
-
-# Add the maven-axis and JIRA plugin by default when using maven 1.x
-if [ -e $out/maven/bin/maven ]
-then
-  export OLD_HOME=$HOME
-  export HOME=.
-  $out/maven/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7
-  export HOME=OLD_HOME
-fi
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@ -1,21 +1,43 @@
-{ lib, stdenv, fetchurl, jdk, makeWrapper }:
+{ lib
+, stdenvNoCC
+, fetchurl
+, jdk
+, makeWrapper
+, callPackage
+}:

 assert jdk != null;

-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "apache-maven";
  version = "3.9.2";

-  builder = ./builder.sh;
-
  src = fetchurl {
-    url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
-    sha256 = "sha256-gJ7zIgxtF5GVwGwyTLmm002Oy6Vmxc/Y64MWe8A0EX0=";
+    url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz";
+    hash = "sha256-gJ7zIgxtF5GVwGwyTLmm002Oy6Vmxc/Y64MWe8A0EX0=";
  };

+  sourceRoot = ".";
+
  nativeBuildInputs = [ makeWrapper ];

-  inherit jdk;
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/maven
+    cp -r ${finalAttrs.pname}-${finalAttrs.version}/* $out/maven
+
+    makeWrapper $out/maven/bin/mvn $out/bin/mvn \
+      --set-default JAVA_HOME "${jdk}"
+    makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \
+      --set-default JAVA_HOME "${jdk}"
+
+    runHook postInstall
+  '';
+
+  passthru.buildMavenPackage = callPackage ./build-package.nix {
+    maven = finalAttrs.finalPackage;
+  };

  meta = with lib; {
    mainProgram = "mvn";
@ -25,4 +47,4 @@ stdenv.mkDerivation rec {
    platforms = platforms.unix;
    maintainers = with maintainers; [ cko ];
  };
-}
+})
--- a/pkgs/development/tools/database/schemaspy/default.nix
+++ b/pkgs/development/tools/database/schemaspy/default.nix
@ -1,5 +1,4 @@
 { lib
-, javaPackages
 , maven
 , jre
 , makeWrapper
@ -9,7 +8,7 @@
 , ensureNewerSourcesHook
 }:

-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
  pname = "schemaspy";
  version = "6.1.1-SNAPSHOT";

--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/pkgs/development/tools/global-platform-pro/default.nix
@ -1,13 +1,11 @@
-{ lib, javaPackages, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }:
+{ lib, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }:

 let
  mavenJdk8 = maven.override {
    jdk = jdk8;
  };
 in
-(javaPackages.mavenfod.override {
-  maven = mavenJdk8;
-}) rec {
+mavenJdk8.buildMavenPackage rec {
  pname = "global-platform-pro";
  version = "18.09.14";
  GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty
--- a/pkgs/development/tools/java/java-language-server/default.nix
+++ b/pkgs/development/tools/java/java-language-server/default.nix
@ -1,4 +1,4 @@
-{ lib, javaPackages, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , jdk, maven
 , makeWrapper
 }:
@ -10,7 +10,7 @@ let
    else if stdenv.isWindows then "windows"
    else throw "unsupported platform";
 in
-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
  pname = "java-language-server";
  version = "0.2.38";

--- a/pkgs/games/forge-mtg/default.nix
+++ b/pkgs/games/forge-mtg/default.nix
@ -1,12 +1,10 @@
 { coreutils
 , fetchFromGitHub
 , gnused
-, javaPackages
 , lib
 , maven
 , makeWrapper
 , openjdk
-, stdenv
 }:

 let
@ -22,7 +20,8 @@ let
  # launch4j downloads and runs a native binary during the package phase.
  patches = [ ./no-launch4j.patch ];

-in javaPackages.mavenfod {
+in
+maven.buildMavenPackage {
  pname = "forge-mtg";
  inherit version src patches;

--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@ -1,6 +1,6 @@
-{ lib, javaPackages, fetchFromGitHub, maven, makeWrapper, jdk }:
+{ lib, fetchFromGitHub, maven, makeWrapper, jdk }:

-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
  pname = "exhibitor";
  version = "1.5.6";

--- a/pkgs/servers/keycloak/scim-for-keycloak/default.nix
+++ b/pkgs/servers/keycloak/scim-for-keycloak/default.nix
@ -1,11 +1,9 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , maven
-, javaPackages
 }:

-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
  pname = "scim-for-keycloak";
  version = "kc-15-b2"; # When updating also update mvnHash

--- a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
+++ b/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
@ -1,11 +1,9 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , maven
-, javaPackages
 }:

-javaPackages.mavenfod rec {
+maven.buildMavenPackage {
  pname = "scim-keycloak-user-storage-spi";
  version = "unstable-2023-04-12";

--- a/pkgs/tools/security/cryptomator/default.nix
+++ b/pkgs/tools/security/cryptomator/default.nix
@ -1,10 +1,10 @@
-{ lib, javaPackages, fetchFromGitHub
+{ lib, fetchFromGitHub
 , autoPatchelfHook
 , fuse3
 , maven, jdk, makeShellWrapper, glib, wrapGAppsHook
 }:

-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
  pname = "cryptomator";
  version = "1.8.0";

--- a/pkgs/tools/security/jd-cli/default.nix
+++ b/pkgs/tools/security/jd-cli/default.nix
@ -1,6 +1,6 @@
-{ lib, javaPackages, fetchFromGitHub, jre, makeWrapper, maven }:
+{ lib, fetchFromGitHub, jre, makeWrapper, maven }:

-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
  pname = "jd-cli";
  version = "1.2.1";

--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@ -8,7 +8,7 @@ let
  openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { };
  openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { };

-  mavenfod = callPackage ../development/java-modules/maven-fod.nix { };
+  mavenfod = pkgs.maven.buildMavenPackage;

 in {
  inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19;