b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: replace mavenfod with buildMavenPackage

Browse source
This commit is contained in:
Weijia Wang 2023-06-20 19:59:30 +03:00
parent 40001fa439
commit dca415554f
9 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/science/electronics/digital/default.nix
View file

@ -1,4 +1,4 @@
{ lib, javaPackages, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper { lib, fetchFromGitHub, makeDesktopItem, copyDesktopItems, makeWrapper
, jre, maven , jre, maven
}: }:
@ -27,7 +27,7 @@ let
# Also use the commit date as a build and output timestamp. # 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}"; mvnParameters = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
in in
javaPackages.mavenfod rec { maven.buildMavenPackage rec {
pname = "digital"; pname = "digital";
inherit version jre; inherit version jre;

3
pkgs/development/tools/database/schemaspy/default.nix
View file

@ -1,5 +1,4 @@
{ lib { lib
, javaPackages
, maven , maven
, jre , jre
, makeWrapper , makeWrapper
@ -9,7 +8,7 @@
, ensureNewerSourcesHook , ensureNewerSourcesHook
}: }:
javaPackages.mavenfod rec { maven.buildMavenPackage rec {
pname = "schemaspy"; pname = "schemaspy";
version = "6.1.1-SNAPSHOT"; version = "6.1.1-SNAPSHOT";

4
pkgs/development/tools/java/java-language-server/default.nix
View file

@ -1,4 +1,4 @@
{ lib, javaPackages, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, jdk, maven , jdk, maven
, makeWrapper , makeWrapper
}: }:
@ -10,7 +10,7 @@ let
else if stdenv.isWindows then "windows" else if stdenv.isWindows then "windows"
else throw "unsupported platform"; else throw "unsupported platform";
in in
javaPackages.mavenfod rec { maven.buildMavenPackage rec {
pname = "java-language-server"; pname = "java-language-server";
version = "0.2.38"; version = "0.2.38";

5
pkgs/games/forge-mtg/default.nix
View file

@ -1,12 +1,10 @@
{ coreutils { coreutils
, fetchFromGitHub , fetchFromGitHub
, gnused , gnused
, javaPackages
, lib , lib
, maven , maven
, makeWrapper , makeWrapper
, openjdk , openjdk
, stdenv
}: }:
let let
@ -22,7 +20,8 @@ let
# launch4j downloads and runs a native binary during the package phase. # launch4j downloads and runs a native binary during the package phase.
patches = [ ./no-launch4j.patch ]; patches = [ ./no-launch4j.patch ];
in javaPackages.mavenfod { in
maven.buildMavenPackage {
pname = "forge-mtg"; pname = "forge-mtg";
inherit version src patches; inherit version src patches;

4
pkgs/servers/exhibitor/default.nix
View file

@ -1,6 +1,6 @@
{ lib, javaPackages, fetchFromGitHub, maven, makeWrapper, jdk }: { lib, fetchFromGitHub, maven, makeWrapper, jdk }:
javaPackages.mavenfod rec { maven.buildMavenPackage rec {
pname = "exhibitor"; pname = "exhibitor";
version = "1.5.6"; version = "1.5.6";

4
pkgs/servers/keycloak/scim-for-keycloak/default.nix
View file

@ -1,11 +1,9 @@
{ lib { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, maven , maven
, javaPackages
}: }:
javaPackages.mavenfod rec { maven.buildMavenPackage rec {
pname = "scim-for-keycloak"; pname = "scim-for-keycloak";
version = "kc-15-b2"; # When updating also update mvnHash version = "kc-15-b2"; # When updating also update mvnHash

4
pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
View file

@ -1,11 +1,9 @@
{ lib { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, maven , maven
, javaPackages
}: }:
javaPackages.mavenfod rec { maven.buildMavenPackage {
pname = "scim-keycloak-user-storage-spi"; pname = "scim-keycloak-user-storage-spi";
version = "unstable-2023-04-12"; version = "unstable-2023-04-12";

4
pkgs/tools/security/cryptomator/default.nix
View file

@ -1,10 +1,10 @@
{ lib, javaPackages, fetchFromGitHub { lib, fetchFromGitHub
, autoPatchelfHook , autoPatchelfHook
, fuse3 , fuse3
, maven, jdk, makeShellWrapper, glib, wrapGAppsHook , maven, jdk, makeShellWrapper, glib, wrapGAppsHook
}: }:
javaPackages.mavenfod rec { maven.buildMavenPackage rec {
pname = "cryptomator"; pname = "cryptomator";
version = "1.8.0"; version = "1.8.0";

4
pkgs/tools/security/jd-cli/default.nix
View file

@ -1,6 +1,6 @@
{ lib, javaPackages, fetchFromGitHub, jre, makeWrapper, maven }: { lib, fetchFromGitHub, jre, makeWrapper, maven }:
javaPackages.mavenfod rec { maven.buildMavenPackage rec {
pname = "jd-cli"; pname = "jd-cli";
version = "1.2.1"; version = "1.2.1";