cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

treewide: remove mavenfod overrides

Browse source
This commit is contained in:
Weijia Wang 2023-06-20 19:54:51 +03:00
parent 00bc3c531d
commit 40001fa439
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -1,13 +1,11 @@
{ lib, javaPackages, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: { lib, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }:
let let
mavenJdk8 = maven.override { mavenJdk8 = maven.override {
jdk = jdk8; jdk = jdk8;
}; };
in in
(javaPackages.mavenfod.override { mavenJdk8.buildMavenPackage rec {
maven = mavenJdk8;
}) rec {
pname = "global-platform-pro"; pname = "global-platform-pro";
version = "18.09.14"; version = "18.09.14";
GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty