Merge pull request #248575 from tjni/jdk-fx

openjdk[17,18,19,20]: add zulu javaFx on darwin

authored by

Weijia Wang and committed by
GitHub
6c96f0d1 9f3079a7

+70 -22
+17 -5
pkgs/development/compilers/openjdk/darwin/17.nix
··· 1 - { lib, stdenv, fetchurl, unzip, setJavaClassPath }: 2 let 3 # Details from https://www.azul.com/downloads/?version=java-17-lts&os=macos&package=jdk 4 # Note that the latest build may differ by platform ··· 7 arch = "x64"; 8 zuluVersion = "17.44.15"; 9 jdkVersion = "17.0.8"; 10 - hash = "sha256-Ci18gBkAv/UUIQw9KlnfibcQMXwQRGx6K7L/NBB7b7Q="; 11 }; 12 13 aarch64-darwin = { 14 arch = "aarch64"; 15 zuluVersion = "17.44.15"; 16 jdkVersion = "17.0.8"; 17 - hash = "sha256-8b81QY6DGXVOsTKM8QDzJnYjXV0ipCbYWaaz6oF2A6k="; 18 }; 19 }."${stdenv.hostPlatform.system}"; 20 ··· 23 hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o="; 24 }; 25 26 jdk = stdenv.mkDerivation rec { 27 - pname = "zulu${dist.zuluVersion}-ca-jdk"; 28 version = dist.jdkVersion; 29 30 src = fetchurl { 31 - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; 32 inherit (dist) hash; 33 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; 34 };
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , unzip 5 + , setJavaClassPath 6 + , enableJavaFX ? false 7 + }: 8 let 9 # Details from https://www.azul.com/downloads/?version=java-17-lts&os=macos&package=jdk 10 # Note that the latest build may differ by platform ··· 13 arch = "x64"; 14 zuluVersion = "17.44.15"; 15 jdkVersion = "17.0.8"; 16 + hash = 17 + if enableJavaFX then "sha256-gmDku/AkWzO+eDRitezM9wCtTYDrUMtXyMulxqi9tNI=" 18 + else "sha256-Ci18gBkAv/UUIQw9KlnfibcQMXwQRGx6K7L/NBB7b7Q="; 19 }; 20 21 aarch64-darwin = { 22 arch = "aarch64"; 23 zuluVersion = "17.44.15"; 24 jdkVersion = "17.0.8"; 25 + hash = 26 + if enableJavaFX then "sha256-mvyfqpnAoA05HJB9EBewW2MDuhQBOvp6svzyayV1irI=" 27 + else "sha256-8b81QY6DGXVOsTKM8QDzJnYjXV0ipCbYWaaz6oF2A6k="; 28 }; 29 }."${stdenv.hostPlatform.system}"; 30 ··· 33 hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o="; 34 }; 35 36 + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; 37 + 38 jdk = stdenv.mkDerivation rec { 39 + pname = "zulu${dist.zuluVersion}-${javaPackage}"; 40 version = dist.jdkVersion; 41 42 src = fetchurl { 43 + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; 44 inherit (dist) hash; 45 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; 46 };
+17 -5
pkgs/development/compilers/openjdk/darwin/18.nix
··· 1 - { lib, stdenv, fetchurl, unzip, setJavaClassPath }: 2 let 3 # Details from https://www.azul.com/downloads/?version=java-18-sts&os=macos&package=jdk 4 # Note that the latest build may differ by platform ··· 7 arch = "x64"; 8 zuluVersion = "18.32.13"; 9 jdkVersion = "18.0.2.1"; 10 - hash = "sha256-uHPcyOgxUdTgzmIVRp/awtwve9zSt+1TZNef7DUuoRg="; 11 }; 12 13 aarch64-darwin = { 14 arch = "aarch64"; 15 zuluVersion = "18.32.13"; 16 jdkVersion = "18.0.2.1"; 17 - hash = "sha256-jAZDgxtWMq/74yKAxA69oOU0C9nXvKG5MjmZLsK04iM="; 18 }; 19 }."${stdenv.hostPlatform.system}"; 20 ··· 23 hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o="; 24 }; 25 26 jdk = stdenv.mkDerivation rec { 27 - pname = "zulu${dist.zuluVersion}-ca-jdk"; 28 version = dist.jdkVersion; 29 30 src = fetchurl { 31 - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; 32 inherit (dist) hash; 33 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; 34 };
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , unzip 5 + , setJavaClassPath 6 + , enableJavaFX ? false 7 + }: 8 let 9 # Details from https://www.azul.com/downloads/?version=java-18-sts&os=macos&package=jdk 10 # Note that the latest build may differ by platform ··· 13 arch = "x64"; 14 zuluVersion = "18.32.13"; 15 jdkVersion = "18.0.2.1"; 16 + hash = 17 + if enableJavaFX then "sha256-ZVZ1gbpJwxTduq2PPOCKqbSl+shq2NTFgqG++OXvFcg=" 18 + else "sha256-uHPcyOgxUdTgzmIVRp/awtwve9zSt+1TZNef7DUuoRg="; 19 }; 20 21 aarch64-darwin = { 22 arch = "aarch64"; 23 zuluVersion = "18.32.13"; 24 jdkVersion = "18.0.2.1"; 25 + hash = 26 + if enableJavaFX then "sha256-tNx0a1u9iamcN9VFOJ3eqDEA6C204dtIBJZvuAH2Vjk=" 27 + else "sha256-jAZDgxtWMq/74yKAxA69oOU0C9nXvKG5MjmZLsK04iM="; 28 }; 29 }."${stdenv.hostPlatform.system}"; 30 ··· 33 hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o="; 34 }; 35 36 + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; 37 + 38 jdk = stdenv.mkDerivation rec { 39 + pname = "zulu${dist.zuluVersion}-${javaPackage}"; 40 version = dist.jdkVersion; 41 42 src = fetchurl { 43 + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; 44 inherit (dist) hash; 45 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; 46 };
+19 -7
pkgs/development/compilers/openjdk/darwin/19.nix
··· 1 - { lib, stdenv, fetchurl, unzip, setJavaClassPath }: 2 let 3 # Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk 4 # Note that the latest build may differ by platform 5 dist = { 6 x86_64-darwin = { 7 arch = "x64"; 8 - zuluVersion = "19.32.13"; 9 jdkVersion = "19.0.2"; 10 - hash = "sha256-KARXWumsY+OcqpEOV2EL9SsPni1nGSipjRji/Mn2KsE="; 11 }; 12 13 aarch64-darwin = { 14 arch = "aarch64"; 15 - zuluVersion = "19.32.13"; 16 jdkVersion = "19.0.2"; 17 - hash = "sha256-F30FjZaLL756X/Xs6xjNwW9jds4pEATxoxOeeLL7Y5E="; 18 }; 19 }."${stdenv.hostPlatform.system}"; 20 ··· 23 hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o="; 24 }; 25 26 jdk = stdenv.mkDerivation rec { 27 - pname = "zulu${dist.zuluVersion}-ca-jdk"; 28 version = dist.jdkVersion; 29 30 src = fetchurl { 31 - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; 32 inherit (dist) hash; 33 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; 34 };
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , unzip 5 + , setJavaClassPath 6 + , enableJavaFX ? false 7 + }: 8 let 9 # Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk 10 # Note that the latest build may differ by platform 11 dist = { 12 x86_64-darwin = { 13 arch = "x64"; 14 + zuluVersion = if enableJavaFX then "19.32.15" else "19.32.13"; 15 jdkVersion = "19.0.2"; 16 + hash = 17 + if enableJavaFX then "sha256-AwLcIId0gH5D6DUU8CgJ3qnKVQm28LXYirBeXBHwPYE=" 18 + else "sha256-KARXWumsY+OcqpEOV2EL9SsPni1nGSipjRji/Mn2KsE="; 19 }; 20 21 aarch64-darwin = { 22 arch = "aarch64"; 23 + zuluVersion = if enableJavaFX then "19.32.15" else "19.32.13"; 24 jdkVersion = "19.0.2"; 25 + hash = 26 + if enableJavaFX then "sha256-/R2rrcBr64qPGEtvhruXBhPwnvurt/hiR1ICzZAdYxE=" 27 + else "sha256-F30FjZaLL756X/Xs6xjNwW9jds4pEATxoxOeeLL7Y5E="; 28 }; 29 }."${stdenv.hostPlatform.system}"; 30 ··· 33 hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o="; 34 }; 35 36 + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; 37 + 38 jdk = stdenv.mkDerivation rec { 39 + pname = "zulu${dist.zuluVersion}-${javaPackage}"; 40 version = dist.jdkVersion; 41 42 src = fetchurl { 43 + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; 44 inherit (dist) hash; 45 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; 46 };
+17 -5
pkgs/development/compilers/openjdk/darwin/20.nix
··· 1 - { lib, stdenv, fetchurl, unzip, setJavaClassPath }: 2 let 3 # Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk 4 # Note that the latest build may differ by platform ··· 7 arch = "x64"; 8 zuluVersion = "20.32.11"; 9 jdkVersion = "20.0.2"; 10 - hash = "sha256-Ev9KG6DvuBnsZrOguLsO1KQzudHCBcJNwKh45Inpnfo="; 11 }; 12 13 aarch64-darwin = { 14 arch = "aarch64"; 15 zuluVersion = "20.32.11"; 16 jdkVersion = "20.0.2"; 17 - hash = "sha256-15uNZ6uMfSASV3QU2q2oA/jBk2PCHOfSjn1GY7/7qIY="; 18 }; 19 }."${stdenv.hostPlatform.system}"; 20 ··· 23 hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o="; 24 }; 25 26 jdk = stdenv.mkDerivation rec { 27 - pname = "zulu${dist.zuluVersion}-ca-jdk"; 28 version = dist.jdkVersion; 29 30 src = fetchurl { 31 - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; 32 inherit (dist) hash; 33 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; 34 };
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , unzip 5 + , setJavaClassPath 6 + , enableJavaFX ? false 7 + }: 8 let 9 # Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk 10 # Note that the latest build may differ by platform ··· 13 arch = "x64"; 14 zuluVersion = "20.32.11"; 15 jdkVersion = "20.0.2"; 16 + hash = 17 + if enableJavaFX then "sha256-hyxQAivZAXtqMebe30L+EYa7p+TdSdKNYj7Rl/ZwRNQ=" 18 + else "sha256-Ev9KG6DvuBnsZrOguLsO1KQzudHCBcJNwKh45Inpnfo="; 19 }; 20 21 aarch64-darwin = { 22 arch = "aarch64"; 23 zuluVersion = "20.32.11"; 24 jdkVersion = "20.0.2"; 25 + hash = 26 + if enableJavaFX then "sha256-iPQzZS4CwaoqT8cSzg4kWCT1OyGBSJLq+NETcbucLo4=" 27 + else "sha256-15uNZ6uMfSASV3QU2q2oA/jBk2PCHOfSjn1GY7/7qIY="; 28 }; 29 }."${stdenv.hostPlatform.system}"; 30 ··· 33 hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o="; 34 }; 35 36 + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; 37 + 38 jdk = stdenv.mkDerivation rec { 39 + pname = "zulu${dist.zuluVersion}-${javaPackage}"; 40 version = dist.jdkVersion; 41 42 src = fetchurl { 43 + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; 44 inherit (dist) hash; 45 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; 46 };