Unverified Commit 0c6a4d40 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #287273 from wegank/zulu-16-drop 

openjdk16: make linux-only
parents 5614d918 111dd2ed

pkgs/development/compilers/zulu/16.nix

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
{ 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" ])

pkgs/top-level/java-packages.nix

+4 −7
Original line number Diff line number Diff line
@@ -176,10 +176,7 @@ in { 
      openjfx = openjfx15;

    };



    openjdk16 = mkOpenjdk

      ../development/compilers/openjdk/16.nix

      ../development/compilers/zulu/16.nix

      {

    openjdk16 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/16.nix {

      inherit openjdk16-bootstrap;

      openjfx = openjfx15;

    };