treewide: replace mavenfod with buildMavenPackage

9 files changed, 15 insertions, 21 deletions

diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix
index b0fa0af6c48..147e27a8353 100644
--- 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;
 
diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix
index 8f17e16122e..92bbb19a599 100644
--- 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";
 
diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix
index 0a11c9c0e79..6087b0496b1 100644
--- 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";
 
diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix
index e5b209c6510..32a756ce620 100644
--- 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;
 
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index fce258a8eba..ead65a9b205 100644
--- 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";
 
diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/servers/keycloak/scim-for-keycloak/default.nix
index e2dca3f632e..f694c3f32e5 100644
--- 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
 
diff --git a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
index 8f0ecd74048..74b2d2efa8e 100644
--- 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";
 
diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix
index 2c20615b1e2..cfde59a7e78 100644
--- 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";
 
diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/tools/security/jd-cli/default.nix
index b345565cbba..102a41833ec 100644
--- 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";