treewide: remove mavenfod overrides (40001fa4) · Commits · nix / nixpkgs

pkgs/applications/misc/dbeaver/default.nix

+1 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		, maven
		, webkitgtk_4_1
		, glib-networking
		, javaPackages
		}:

		let
		@@ -24,9 +23,7 @@ let
		jdk = jdk17;
		};
		in
		(javaPackages.mavenfod.override {
		maven = mavenJdk17;
		}) rec {
		mavenJdk17.buildMavenPackage rec {
		pname = "dbeaver";
		version = "22.2.2"; # When updating also update mvnHash

+1 −3

Original line number	Diff line number	Diff line
		@@ -5,9 +5,7 @@ let
		jdk = jdk11;
		};
		in
		(javaPackages.mavenfod.override {
		maven = mavenJdk11;
		}) rec {
		mavenJdk11.buildMavenPackage rec {
		pname = "gephi";
		version = "0.10.1";

+2 −4

Original line number	Diff line number	Diff line
		{ lib, javaPackages, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }:
		{ lib, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }:

		let
		mavenJdk8 = maven.override {
		jdk = jdk8;
		};
		in
		(javaPackages.mavenfod.override {
		maven = mavenJdk8;
		}) rec {
		mavenJdk8.buildMavenPackage rec {
		pname = "global-platform-pro";
		version = "18.09.14";
		GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty