diff options
| author | Sandro Jäckel <sandro.jaeckel@sap.com> | 2023-01-31 17:56:09 +0100 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-04-14 22:23:39 -0300 |
| commit | e0c22ecf8eee86ce76add5f3d1abc055a9825598 (patch) | |
| tree | fc2f1b86998272127a418caceaf0f9cc5a7bd771 /pkgs | |
| parent | 8204a95ef21d4509af5d30cf0ac48a05cee208f9 (diff) | |
javaPackages: cleanup unused code
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/temurin-bin/jdk-linux-base.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/java-packages.nix | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index c601ca63b7cd4..b8726749bef88 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -40,7 +40,7 @@ let providedCpuTypes = builtins.filter (arch: builtins.elem arch validCpuTypes) (builtins.attrNames sourcePerArch); - result = stdenv.mkDerivation rec { + result = stdenv.mkDerivation { pname = if sourcePerArch.packageType == "jdk" then "${name-prefix}-bin" else "${name-prefix}-${sourcePerArch.packageType}-bin"; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index f649717f1845d..abdfafa7d0523 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -34,7 +34,7 @@ in { package = if stdenv.isLinux then package-linux else package-darwin; - in rec { + in { inherit package-linux package-darwin; jdk-hotspot = callPackage package.jdk-hotspot {}; @@ -66,11 +66,7 @@ in { headless = openjdk.override { headless = true; }; }; - openjdkDarwinMissing = version: - abort "OpenJDK ${builtins.toString version} is currently not supported on Darwin by nixpkgs."; - in rec { - adoptopenjdk-8 = mkAdoptopenjdk ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; |