diff options
Diffstat (limited to 'pkgs/development/compilers/openjdk')
-rw-r--r-- | pkgs/development/compilers/openjdk/16.nix | 11 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/18.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/19.nix | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/20.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/20.nix | 10 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/21.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/22.nix | 9 |
7 files changed, 31 insertions, 28 deletions
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 4b0874a03a415..12ba5c9c16dbb 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -11,8 +11,8 @@ let version = { feature = "16"; - interim = "0"; - build = "36"; + interim = ".0.2-ga"; + build = "1"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -20,13 +20,14 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}+${version.build}"; + version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}+${version.build}"; - sha256 = "165nr15dqfcxzsl5z95g4iklln4rlfkgdigdma576mx8813ldi44"; + rev = "jdk-${version.feature}${version.interim}"; + # rev = "jdk-${version.feature}${version.interim}+${version.build}"; + sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 2c496721be070..5ce4ff8f54671 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -11,7 +11,8 @@ let version = { feature = "18"; - build = "36"; + interim = ".0.2.1"; + build = "1"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -19,13 +20,13 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}+${version.build}"; + version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}+${version.build}"; - sha256 = "sha256-yGPC8VA983Ml6Fv/oiEgRrcVe4oe+Q4oCHbzOmFbZq8="; + rev = "jdk-${version.feature}${version.interim}+${version.build}"; + sha256 = "sha256-L6dsN0kqWcfemM8LBg62qtHQdymwRQoV1ndc8r+0qn8="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 51fd0d8eb533f..187d724b57b55 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -14,8 +14,8 @@ let version = { feature = "19"; - interim = ".0.2"; - build = "7"; + interim = "-ga"; + build = ""; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -23,13 +23,15 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}+${version.build}"; + version = "${version.feature}${version.interim}"; + # version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI="; + rev = "jdk-${version.feature}${version.interim}"; + # rev = "jdk-${version.feature}${version.interim}+${version.build}"; + hash = "sha256-XbYTku/nWF+maBvYz2rJYIUBEgOmqICKjk9wufHqyj0="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix index 2be834a27b58e..bdb7d057f2633 100644 --- a/pkgs/development/compilers/openjdk/20.nix +++ b/pkgs/development/compilers/openjdk/20.nix @@ -14,8 +14,8 @@ let version = { feature = "20"; - interim = ""; - build = "36"; + interim = ".0.2"; + build = "9"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -29,7 +29,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-fXoSO8nq5qpUYbCtbrRr2C46XRdYX77Pxmk7GfmlZV4="; + hash = "sha256-CZH2JwR+MrkTlLdcVYuFRB3McdrM0A+1YaSjNpjYwak="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix index 794590dc7e606..10b44be546e99 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true @@ -7,8 +7,8 @@ let major = "20"; - update = ""; - build = "+19"; + update = ".0.2"; + build = "-ga"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { # note: gradle does not yet support running on 19 @@ -30,9 +30,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx20u"; rev = repover; - hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU="; + hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix index f49dbe3b0e985..071420100e975 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22.nix index d585dbdf01413..0ff861ed125d6 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , fetchurl , runCommand , writeText @@ -26,8 +25,8 @@ let major = "22"; - update = ""; - build = "+30"; + update = ".0.1"; + build = "-ga"; repover = "${major}${update}${build}"; icuVersionWithSep = s: "73${s}1"; @@ -45,9 +44,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx22u"; rev = repover; - hash = "sha256-sZF7ZPC0kgTTxWgtkxmGtOlfroGPGVZcMw0/wSTJUxQ="; + hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; |