Commit dca41555 authored by Weijia Wang's avatar Weijia Wang
Browse files

treewide: replace mavenfod with buildMavenPackage

parent 40001fa4

pkgs/applications/science/electronics/digital/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/development/tools/database/schemaspy/default.nix

+1 −2
Original line number Diff line number Diff line 
{ lib

, javaPackages

, maven

, jre

, makeWrapper
@@ -9,7 +8,7 @@ 
, ensureNewerSourcesHook

}:



javaPackages.mavenfod rec {

maven.buildMavenPackage rec {

  pname = "schemaspy";

  version = "6.1.1-SNAPSHOT";

pkgs/development/tools/java/java-language-server/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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";

pkgs/games/forge-mtg/default.nix

+2 −3
Original line number Diff line number Diff line 
{ 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;

pkgs/servers/exhibitor/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, javaPackages, fetchFromGitHub, maven, makeWrapper, jdk }:

{ lib, fetchFromGitHub, maven, makeWrapper, jdk }:



javaPackages.mavenfod rec {

maven.buildMavenPackage rec {

  pname = "exhibitor";

  version = "1.5.6";