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

Merge pull request #246393 from wegank/maven-default-input

Browse source 
buildMavenPackage: refactor
This commit is contained in:
Weijia Wang 2023-07-31 22:26:51 +02:00 committed by GitHub
parent 94afc043d5 30464bb5c5
commit 5988b8b107
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/misc/dbeaver/default.nix
View file

@ -40,7 +40,6 @@ mavenJdk17.buildMavenPackage rec {
nativeBuildInputs = [
copyDesktopItems
makeWrapper
mavenJdk17
];
buildInputs = [

1
pkgs/applications/misc/ns-usbloader/default.nix
View file

@ -39,7 +39,6 @@ maven.buildMavenPackage rec {
nativeBuildInputs = [
copyDesktopItems
maven
makeWrapper
];

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

@ -39,9 +39,9 @@ maven.buildMavenPackage rec {
};
inherit mvnParameters;
mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68=";
mvnHash = "sha256-wm/axWJucoW9P98dKqHI4bjrUnmBTfosCOdJg9VBJ+4=";
nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
installPhase = ''
mkdir -p $out/bin

2
pkgs/applications/science/misc/gephi/default.nix
View file

@ -18,7 +18,7 @@ mavenJdk11.buildMavenPackage rec {
mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg=";
nativeBuildInputs = [ jdk11 mavenJdk11 ];
nativeBuildInputs = [ jdk11 ];
installPhase = ''
cp -r modules/application/target/gephi $out

15
pkgs/development/tools/build-managers/apache-maven/build-package.nix
View file

@ -16,7 +16,7 @@
# originally extracted from dbeaver
# created to allow using maven packages in the same style as rust
stdenv.mkDerivation (rec {
let
fetchedMavenDeps = stdenv.mkDerivation ({
name = "${pname}-${version}-maven-deps";
inherit src patches;
@ -44,6 +44,13 @@ stdenv.mkDerivation (rec {
outputHashMode = "recursive";
outputHash = mvnHash;
} // mvnFetchExtraArgs);
in
stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // {
inherit fetchedMavenDeps;
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
maven
];
buildPhase = ''
runHook preBuild
@ -53,4 +60,8 @@ stdenv.mkDerivation (rec {
runHook postBuild
'';
} // builtins.removeAttrs args [ "mvnFetchExtraArgs" ])
meta = args.meta or { } // {
platforms = args.meta.platforms or maven.meta.platforms;
};
})

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

@ -33,7 +33,6 @@ maven.buildMavenPackage rec {
nativeBuildInputs = [
makeWrapper
git
maven
# springframework boot gets angry about 1970 sources
# fix from https://github.com/nix-community/mavenix/issues/25

7
pkgs/development/tools/global-platform-pro/default.nix
View file

@ -17,9 +17,9 @@ mavenJdk8.buildMavenPackage rec {
sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg";
};
mvnHash = "sha256-rRLsCTY3fEAvGRDvNXqpjac2Gb5fdlyhK2wTK5CVN9k=";
mvnHash = "sha256-xFcEZpJ0+ApJTDTuA63LgvUwLrxATVKoj5Mh3WZyfq8=";
nativeBuildInputs = [ jdk8 mavenJdk8 makeWrapper ];
nativeBuildInputs = [ jdk8 makeWrapper ];
installPhase = ''
mkdir -p "$out/lib/java" "$out/share/java"
@ -41,11 +41,10 @@ mavenJdk8.buildMavenPackage rec {
homepage = "https://github.com/martinpaljak/GlobalPlatformPro";
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # deps
binaryBytecode # deps
];
license = with licenses; [ lgpl3 ];
maintainers = with maintainers; [ ekleog ];
mainProgram = "gp";
platforms = platforms.all;
};
}

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

@ -24,9 +24,9 @@ maven.buildMavenPackage rec {
mvnFetchExtraArgs.dontConfigure = true;
mvnParameters = "-DskipTests";
mvnHash = "sha256-bzYBSrCS9Kp+qnVO60h915Or1VWabphwLEu6lcBULuc=";
mvnHash = "sha256-XhAqd67RtETd9XvqbiEuTOwPUsUtoLkhXy2Dde7NLTo=";
nativeBuildInputs = [ maven jdk makeWrapper ];
nativeBuildInputs = [ jdk makeWrapper ];
dontConfigure = true;
preBuild = ''
@ -56,6 +56,5 @@ maven.buildMavenPackage rec {
homepage = "https://github.com/georgewfraser/java-language-server";
license = licenses.mit;
maintainers = with maintainers; [ hqurve ];
platforms = platforms.all;
};
}

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

@ -29,7 +29,7 @@ maven.buildMavenPackage {
mvnParameters = "-DskipTests";
mvnHash = "sha256-ajrHnaiJS7ZnR9BjLaXK2bnAKCp5UWQqYpjWbz3z6bw=";
nativeBuildInputs = [ maven makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
@ -59,7 +59,6 @@ maven.buildMavenPackage {
meta = with lib; {
description = "Magic: the Gathering card game with rules enforcement";
homepage = "https://www.slightlymagic.net/forum/viewforum.php?f=26";
platforms = openjdk.meta.platforms;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ eigengrau ];
};

2
pkgs/servers/keycloak/keycloak-metrics-spi/default.nix
View file

@ -13,8 +13,6 @@ maven.buildMavenPackage rec {
mvnHash = "sha256-rwAc2KtKo4vJ0JWwPquMyt+FHVNTmMpzBPbo8lWDN/A=";
nativeBuildInputs = [ maven ];
installPhase = ''
runHook preInstall
install -Dm444 -t "$out" target/keycloak-metrics-spi-*.jar

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

@ -16,10 +16,6 @@ maven.buildMavenPackage rec {
mvnHash = "sha256-MWxm2q6tx8YcdEsleC2h+s+lp9whi11VQ1yFr8AZUyQ=";
nativeBuildInputs = [
maven
];
installPhase = ''
EAR=$(find -iname "*.ear")
install -D "$EAR" "$out/$(basename $EAR)"

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

@ -16,10 +16,6 @@ maven.buildMavenPackage {
mvnHash = "sha256-vNPSNoOmtD1UMfWvLm8CH7RRatyeu3fnX9zteZpkay0=";
nativeBuildInputs = [
maven
];
installPhase = ''
install -D "target/scim-user-spi-0.0.1-SNAPSHOT.jar" "$out/scim-user-spi-0.0.1-SNAPSHOT.jar"
'';

5
pkgs/tools/games/slipstream/default.nix
View file

@ -13,9 +13,9 @@ mavenWithJdk.buildMavenPackage rec {
hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU=";
};
mvnHash = "sha256-oDtUitsfZPiDtyfzzw1yMNBCKyP6rHczKZT/SPPJYGE=";
mvnHash = "sha256-8i3OVSy8RUGVoQzwADszVvNYe50f4nsJie1y7tsOK4U=";
nativeBuildInputs = [ mavenWithJdk makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
@ -44,6 +44,5 @@ mavenWithJdk.buildMavenPackage rec {
homepage = "https://github.com/Vhati/Slipstream-Mod-Manager";
license = licenses.gpl2;
maintainers = with maintainers; [ mib ];
platforms = platforms.all;
};
}

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

@ -67,7 +67,6 @@ maven.buildMavenPackage rec {
nativeBuildInputs = [
autoPatchelfHook
maven
makeShellWrapper
wrapGAppsHook
jdk

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

@ -11,9 +11,9 @@ maven.buildMavenPackage rec {
hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
};
mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo=";
mvnHash = "sha256-1zn980QP48fWvm45HR1yDHdyzHYPkl/P0RpII+Zu+xc=";
nativeBuildInputs = [ maven makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin $out/share/jd-cli
@ -27,7 +27,6 @@ maven.buildMavenPackage rec {
description = "Simple command line wrapper around JD Core Java Decompiler project";
homepage = "https://github.com/intoolswetrust/jd-cli";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ majiir ];
};
}