From 0a16289964177e37bd104a3b2ea51d36347a201a Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 24 Nov 2021 16:29:06 +0100 Subject: [PATCH 1/4] openjdk11: add zulu `javaFX` java package on darwin --- .../compilers/openjdk/darwin/11.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index 0b158a169321..bd83ea82113a 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +{ lib +, stdenv +, fetchurl +, unzip +, setJavaClassPath +, enableJavaFX ? false +}: let # Details from https://www.azul.com/downloads/?version=java-11-lts&os=macos&package=jdk # Note that the latest build may differ by platform @@ -7,29 +13,35 @@ let arch = "x64"; zuluVersion = "11.48.21"; jdkVersion = "11.0.11"; - sha256 = "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6"; + sha256 = + if enableJavaFX then "18bd9cd66d6abc6f8c627bc70278dc8fd4860e138e1dc9e170eddb89727ccc7b" + else "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6"; }; aarch64-darwin = { arch = "aarch64"; zuluVersion = "11.48.21"; jdkVersion = "11.0.11"; - sha256 = "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; + sha256 = + if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9" + else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; + jdk = stdenv.mkDerivation rec { - pname = "zulu${dist.zuluVersion}-ca-jdk"; + pname = "zulu${dist.zuluVersion}-${javaPackage}"; version = dist.jdkVersion; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; inherit (dist) sha256; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; @@ -77,4 +89,5 @@ let meta = import ./meta.nix lib; }; -in jdk +in +jdk From 5e4685f943b73434766aa2802726c8f50e2eead3 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 24 Nov 2021 16:57:07 +0100 Subject: [PATCH 2/4] openjdk8: add zulu `javaFX` java package on darwin --- .../compilers/openjdk/darwin/8.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index c7367a5d642c..2a73fb336c87 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +{ lib +, stdenv +, fetchurl +, unzip +, setJavaClassPath +, enableJavaFX ? false +}: let # Details from https://www.azul.com/downloads/?version=java-8-lts&os=macos&package=jdk # Note that the latest build may differ by platform @@ -7,32 +13,38 @@ let arch = "x64"; zuluVersion = "8.54.0.21"; jdkVersion = "8.0.292"; - sha256 = "1pgl0bir4r5v349gkxk54k6v62w241q7vw4gjxhv2g6pfq6hv7in"; + sha256 = + if enableJavaFX then "e671f8990229b1ca2a76faabb21ba2f1a9e1f7211392e0f657225559be9b05c8" + else "1pgl0bir4r5v349gkxk54k6v62w241q7vw4gjxhv2g6pfq6hv7in"; }; aarch64-darwin = { arch = "aarch64"; zuluVersion = "8.54.0.21"; jdkVersion = "8.0.292"; - sha256 = "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c"; + sha256 = + if enableJavaFX then "1b05b2e40f707a151b063ebba821270fa930ebfc05712bc1f5a8a112395731a6" + else "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; + jdk = stdenv.mkDerivation rec { # @hlolli: Later version than 1.8.0_202 throws error when building jvmci. # dyld: lazy symbol binding failed: Symbol not found: _JVM_BeforeHalt # Referenced from: ../libjava.dylib Expected in: .../libjvm.dylib - pname = "zulu${dist.zuluVersion}-ca-jdk"; + pname = "zulu${dist.zuluVersion}-${javaPackage}"; version = dist.jdkVersion; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; inherit (dist) sha256; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; @@ -75,4 +87,5 @@ let meta = import ./meta.nix lib; }; -in jdk +in +jdk From 2c62693ebaf485ac5503b5af70d7ebf1f736f01c Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 24 Nov 2021 17:45:06 +0100 Subject: [PATCH 3/4] openjdk: add zulu `javaFX` java package on darwin --- .../compilers/openjdk/darwin/16.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/16.nix b/pkgs/development/compilers/openjdk/darwin/16.nix index 1d6776303bf0..56333bd48183 100644 --- a/pkgs/development/compilers/openjdk/darwin/16.nix +++ b/pkgs/development/compilers/openjdk/darwin/16.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +{ lib +, stdenv +, fetchurl +, unzip +, setJavaClassPath +, enableJavaFX ? false +}: let # Details from https://www.azul.com/downloads/?version=java-16-sts&os=macos&package=jdk # Note that the latest build may differ by platform @@ -7,29 +13,35 @@ let arch = "x64"; zuluVersion = "16.30.15"; jdkVersion = "16.0.1"; - sha256 = "1jihn125dmxr9y5h9jq89zywm3z6rbwv5q7msfzsf2wzrr13jh0z"; + sha256 = + if enableJavaFX then "cbb3b96d80a0675893f21dc51ba3f532049c501bd7dc4c8d1ee930e63032c745" + else "1jihn125dmxr9y5h9jq89zywm3z6rbwv5q7msfzsf2wzrr13jh0z"; }; aarch64-darwin = { arch = "aarch64"; zuluVersion = "16.30.19"; jdkVersion = "16.0.1"; - sha256 = "1i0bcjx3acb5dhslf6cabdcnd6mrz9728vxw9hb4al5y3f5fll4w"; + sha256 = + if enableJavaFX then "a49b23abfd83784d2ac935fc24e25ab7cb09b8ffc8e47c32ed446e05b8a21396" + else "1i0bcjx3acb5dhslf6cabdcnd6mrz9728vxw9hb4al5y3f5fll4w"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; + jdk = stdenv.mkDerivation rec { - pname = "zulu${dist.zuluVersion}-ca-jdk"; + pname = "zulu${dist.zuluVersion}-${javaPackage}"; version = dist.jdkVersion; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; inherit (dist) sha256; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; @@ -77,4 +89,5 @@ let meta = import ./meta.nix lib; }; -in jdk +in +jdk From 6893810bd85fe947d33589060c6d678bafab1c44 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 1 Dec 2021 09:30:01 +0100 Subject: [PATCH 4/4] openjdk: pin jce-policies to a version using wayback machine Co-authored-by: SuperSandro2000 --- pkgs/development/compilers/openjdk/darwin/11.nix | 7 +++---- pkgs/development/compilers/openjdk/darwin/16.nix | 3 +-- pkgs/development/compilers/openjdk/darwin/8.nix | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index bd83ea82113a..d8c1bb6bf254 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -23,14 +23,13 @@ let zuluVersion = "11.48.21"; jdkVersion = "11.0.11"; sha256 = - if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9" - else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; + if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9" + else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { - # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; diff --git a/pkgs/development/compilers/openjdk/darwin/16.nix b/pkgs/development/compilers/openjdk/darwin/16.nix index 56333bd48183..d491d75322f4 100644 --- a/pkgs/development/compilers/openjdk/darwin/16.nix +++ b/pkgs/development/compilers/openjdk/darwin/16.nix @@ -29,8 +29,7 @@ let }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { - # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index 2a73fb336c87..1d829450a1ed 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -29,8 +29,7 @@ let }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { - # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; };