mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
Merge pull request #287273 from wegank/zulu-16-drop
openjdk16: make linux-only
This commit is contained in:
commit
0c6a4d40cd
@ -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" ])
|
|
@ -176,13 +176,10 @@ in {
|
|||||||
openjfx = openjfx15;
|
openjfx = openjfx15;
|
||||||
};
|
};
|
||||||
|
|
||||||
openjdk16 = mkOpenjdk
|
openjdk16 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/16.nix {
|
||||||
../development/compilers/openjdk/16.nix
|
inherit openjdk16-bootstrap;
|
||||||
../development/compilers/zulu/16.nix
|
openjfx = openjfx15;
|
||||||
{
|
};
|
||||||
inherit openjdk16-bootstrap;
|
|
||||||
openjfx = openjfx15;
|
|
||||||
};
|
|
||||||
|
|
||||||
openjdk17 = mkOpenjdk
|
openjdk17 = mkOpenjdk
|
||||||
../development/compilers/openjdk/17.nix
|
../development/compilers/openjdk/17.nix
|
||||||
|
Loading…
Reference in New Issue
Block a user