diff options
14 files changed, 8 insertions, 27 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 488b64185b6ed..0e89c7b1b057b 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -40,7 +40,6 @@ mavenJdk17.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper - mavenJdk17 ]; buildInputs = [ diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/applications/misc/ns-usbloader/default.nix index 3abffa42e262b..b86ae37363ee7 100644 --- a/pkgs/applications/misc/ns-usbloader/default.nix +++ b/pkgs/applications/misc/ns-usbloader/default.nix @@ -39,7 +39,6 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems - maven makeWrapper ]; diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 147e27a835308..ae555dd76fc6b 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -41,7 +41,7 @@ maven.buildMavenPackage rec { inherit mvnParameters; mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68="; - nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 3013f08c69826..15b001b4561e4 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -18,7 +18,7 @@ mavenJdk11.buildMavenPackage rec { mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg="; - nativeBuildInputs = [ jdk11 mavenJdk11 ]; + nativeBuildInputs = [ jdk11 ]; installPhase = '' cp -r modules/application/target/gephi $out diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 92bbb19a599ae..6847b9aa20a78 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -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 diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 5a0bc00069535..f60b2222c4e6e 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -19,7 +19,7 @@ mavenJdk8.buildMavenPackage rec { mvnHash = "sha256-rRLsCTY3fEAvGRDvNXqpjac2Gb5fdlyhK2wTK5CVN9k="; - 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; }; } diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix index 6087b0496b1e9..822ee53ba77e6 100644 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -26,7 +26,7 @@ maven.buildMavenPackage rec { mvnParameters = "-DskipTests"; mvnHash = "sha256-bzYBSrCS9Kp+qnVO60h915Or1VWabphwLEu6lcBULuc="; - 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; }; } diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix index 32a756ce620fe..fbcc652d80d33 100644 --- a/pkgs/games/forge-mtg/default.nix +++ b/pkgs/games/forge-mtg/default.nix @@ -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 ]; }; diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index af43f0914f661..7a7442d8946a7 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -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 diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/servers/keycloak/scim-for-keycloak/default.nix index ee3f3ffd7a17f..e192f38fcb109 100644 --- a/pkgs/servers/keycloak/scim-for-keycloak/default.nix +++ b/pkgs/servers/keycloak/scim-for-keycloak/default.nix @@ -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)" 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 b7d3fd579540c..cc6e41aa81f84 100644 --- a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix +++ b/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix @@ -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" ''; diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index 828d0e7ce46e2..69b419d3fa8e7 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/tools/games/slipstream/default.nix @@ -15,7 +15,7 @@ mavenWithJdk.buildMavenPackage rec { mvnHash = "sha256-oDtUitsfZPiDtyfzzw1yMNBCKyP6rHczKZT/SPPJYGE="; - 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; }; } diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index cfde59a7e786c..238a74cc95456 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -67,7 +67,6 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ autoPatchelfHook - maven makeShellWrapper wrapGAppsHook jdk diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/tools/security/jd-cli/default.nix index 102a41833ec1b..d839d00bea921 100644 --- a/pkgs/tools/security/jd-cli/default.nix +++ b/pkgs/tools/security/jd-cli/default.nix @@ -13,7 +13,7 @@ maven.buildMavenPackage rec { mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo="; - 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 ]; }; } |