diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-20 19:54:51 +0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-20 19:54:51 +0300 |
| commit | 40001fa439d86c0ef3a7d31d213620242047843f (patch) | |
| tree | 714a9039716bc4489db62964c544955a16e5a15e /pkgs | |
| parent | 00bc3c531dc3a074717e80dc0914c5e7d390c2d2 (diff) | |
| download | nixpkgs-40001fa439d86c0ef3a7d31d213620242047843f.tar nixpkgs-40001fa439d86c0ef3a7d31d213620242047843f.tar.gz nixpkgs-40001fa439d86c0ef3a7d31d213620242047843f.tar.bz2 nixpkgs-40001fa439d86c0ef3a7d31d213620242047843f.tar.lz nixpkgs-40001fa439d86c0ef3a7d31d213620242047843f.tar.xz nixpkgs-40001fa439d86c0ef3a7d31d213620242047843f.tar.zst nixpkgs-40001fa439d86c0ef3a7d31d213620242047843f.zip | |
treewide: remove mavenfod overrides
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/gephi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/global-platform-pro/default.nix | 6 |
3 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index b984047bb7a..488b64185b6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -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 diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index fffc330b3d5..3013f08c698 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -5,9 +5,7 @@ let jdk = jdk11; }; in -(javaPackages.mavenfod.override { - maven = mavenJdk11; -}) rec { +mavenJdk11.buildMavenPackage rec { pname = "gephi"; version = "0.10.1"; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 229d47a8ec7..5a0bc000695 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,13 +1,11 @@ -{ 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 |