diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-08 19:49:57 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-11 00:42:42 +0100 |
| commit | 111dd2ed970469880a0c5a54fdb8eeccc0361ffb (patch) | |
| tree | 4d1f4ccce424bf23460c749597dcbd38f3e690cc | |
| parent | 010e1d59d8610508d7f9d7a18c6bf6b7c6c357fc (diff) | |
openjdk16: make linux-only
| -rw-r--r-- | pkgs/development/compilers/zulu/16.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/java-packages.nix | 11 |
2 files changed, 4 insertions, 33 deletions
diff --git a/pkgs/development/compilers/zulu/16.nix b/pkgs/development/compilers/zulu/16.nix deleted file mode 100644 index 941a7e8d64f9a..0000000000000 --- a/pkgs/development/compilers/zulu/16.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ callPackage -, enableJavaFX ? false -, ... -}@args: - -callPackage ./common.nix ({ - # Details from https://www.azul.com/downloads/?version=java-16-sts&package=jdk - # Note that the latest build may differ by platform - dists = { - x86_64-darwin = { - zuluVersion = "16.32.15"; - jdkVersion = "16.0.2"; - hash = - if enableJavaFX then "sha256-6URaSBNHQWLauO//kCuKXb4Z7AqyshWnoeJEyVRKgaY=" - else "sha256-NXgBj/KixTknaCYbo3B+rOo11NImH5CDUIU0LhTCtMo="; - }; - - aarch64-darwin = { - zuluVersion = "16.32.15"; - jdkVersion = "16.0.2"; - hash = - if enableJavaFX then "sha256-QuyhIAxUY3Vv1adGihW+LIsXtpDX2taCmFsMFj9o5vs=" - else "sha256-3bUfDcLLyahLeURFAgLAVapBZHvqtam8GHbWTA6MQog="; - }; - }; -} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 3043f8e220eba..6cfd785de1f71 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -176,13 +176,10 @@ in { openjfx = openjfx15; }; - openjdk16 = mkOpenjdk - ../development/compilers/openjdk/16.nix - ../development/compilers/zulu/16.nix - { - inherit openjdk16-bootstrap; - openjfx = openjfx15; - }; + openjdk16 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/16.nix { + inherit openjdk16-bootstrap; + openjfx = openjfx15; + }; openjdk17 = mkOpenjdk ../development/compilers/openjdk/17.nix |