diff --git a/pkgs/by-name/an/anyk/package.nix b/pkgs/by-name/an/anyk/package.nix
index 0bb63de00028..445b461759cf 100644
--- a/pkgs/by-name/an/anyk/package.nix
+++ b/pkgs/by-name/an/anyk/package.nix
@@ -28,7 +28,7 @@ let
   # ÁNYK needs JavaFX for the Ügyfélkapu login webview.
   jdkWithFX = openjdk.override {
     enableJavaFX = true;
-    openjfx = openjfx.override { withWebKit = true; };
+    openjfx_jdk = openjfx.override { withWebKit = true; };
   };
 
   extraClasspath = [
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
deleted file mode 100644
index dfa1a0ab25ae..000000000000
--- a/pkgs/development/compilers/openjdk/11.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{ stdenv, lib, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  major = "11";
-  minor = "0";
-  update = "24";
-  build = "8";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${major}.${minor}.${update}+${build}";
-
-    src = fetchFromGitHub {
-      owner = "openjdk";
-      repo = "jdk${major}u";
-      rev = "jdk-${version}";
-      hash = "sha256-H/VmT6NYbbZBba7Js8xk+epVZ2kLfvlwTNgg5SQ4ljA=";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap.patch
-      ./fix-library-path-jdk11.patch
-
-      # Fix build for gnumake-4.4.1:
-      #   https://github.com/openjdk/jdk/pull/12992
-      (fetchpatch {
-        name = "gnumake-4.4.1";
-        url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-        hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk10.patch
-    ];
-
-    preConfigure = ''
-      chmod +x configure
-      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-    '';
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-harfbuzz=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-      "--disable-warnings-as-errors"
-    ]
-    # Cannot be built by recent versions of Clang, as far as I can tell (see
-    # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to
-    # compile with LLVM 12.
-    ++ lib.optionals stdenv.cc.isClang [
-      "--with-toolchain-type=clang"
-      # Explicitly tell Clang to compile C++ files as C++, see
-      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
-      "--with-extra-cxxflags=-xc++"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isx86_64 "--with-jvm-features=zgc"
-    ++ lib.optional headless "--enable-headless-only"
-    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    # Workaround for
-    # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
-    # when building jtreg
-    env.NIX_CFLAGS_COMPILE = "-Wformat";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    meta = import ./meta.nix lib version;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/currency-date-range-jdk10.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
rename to pkgs/development/compilers/openjdk/11/patches/currency-date-range-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/fix-java-home-jdk10.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
rename to pkgs/development/compilers/openjdk/11/patches/fix-java-home-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch b/pkgs/development/compilers/openjdk/11/patches/fix-library-path-jdk11.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch
rename to pkgs/development/compilers/openjdk/11/patches/fix-library-path-jdk11.patch
diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch b/pkgs/development/compilers/openjdk/11/patches/increase-javadoc-heap.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/increase-javadoc-heap.patch
rename to pkgs/development/compilers/openjdk/11/patches/increase-javadoc-heap.patch
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/read-truststore-from-env-jdk10.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
rename to pkgs/development/compilers/openjdk/11/patches/read-truststore-from-env-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/swing-use-gtk-jdk10.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
rename to pkgs/development/compilers/openjdk/11/patches/swing-use-gtk-jdk10.patch
diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json
new file mode 100644
index 000000000000..8683cdecba3d
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/11/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-H/VmT6NYbbZBba7Js8xk+epVZ2kLfvlwTNgg5SQ4ljA=",
+  "owner": "openjdk",
+  "repo": "jdk11u",
+  "rev": "jdk-11.0.24+8"
+}
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
deleted file mode 100644
index fc2f50fc1157..000000000000
--- a/pkgs/development/compilers/openjdk/17.nix
+++ /dev/null
@@ -1,209 +0,0 @@
-{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio
-, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
-, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
-, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  version = {
-    feature = "17";
-    interim = ".0.12";
-    build = "7";
-  };
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk17-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    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-9UB1H3gd+b4wWxOMgsdDPgX/IGWNORKk1gMsSjYoZMw=";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      ./ignore-LegalNoticeFilePlugin-jdk17.patch
-      ./fix-library-path-jdk17.patch
-
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-
-      # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
-      # This is applied anywhere to prevent patchrot.
-      (fetchurl {
-        url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
-        sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
-      })
-
-      # Fix build for gnumake-4.4.1:
-      #   https://github.com/openjdk/jdk/pull/12992
-      (fetchpatch {
-        name = "gnumake-4.4.1";
-        url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-        hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-      })
-
-      # Backport fixes for musl 1.2.4 which are already applied in jdk21+
-      # Fetching patch from chimera because they already went through the effort of rebasing it onto jdk17
-      (fetchurl {
-        name = "lfs64.patch";
-        url = "https://raw.githubusercontent.com/chimera-linux/cports/4614075d19e9c9636f3f7e476687247f63330a35/contrib/openjdk17/patches/lfs64.patch";
-        hash = "sha256-t2mRbdEiumBAbIAC0zsJNwCn59WYWHsnRtuOSL6bWB4=";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    postPatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-build=${version.build}"
-      "--with-version-opt=nixos"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-harfbuzz=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      "--with-toolchain-type=clang"
-      # Explicitly tell Clang to compile C++ files as C++, see
-      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
-      "--with-extra-cxxflags=-xc++"
-    ]
-    ++ lib.optional headless "--enable-headless-only"
-    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "images" ];
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-
-      # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    pos = builtins.unsafeGetAttrPos "feature" version;
-    meta = import ./meta.nix lib version.feature;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch
rename to pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch
diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch
rename to pkgs/development/compilers/openjdk/17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch
diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch b/pkgs/development/compilers/openjdk/17/patches/increase-javadoc-heap-jdk13.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch
rename to pkgs/development/compilers/openjdk/17/patches/increase-javadoc-heap-jdk13.patch
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch b/pkgs/development/compilers/openjdk/17/patches/swing-use-gtk-jdk13.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch
rename to pkgs/development/compilers/openjdk/17/patches/swing-use-gtk-jdk13.patch
diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json
new file mode 100644
index 000000000000..546e2fff8a19
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/17/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-9UB1H3gd+b4wWxOMgsdDPgX/IGWNORKk1gMsSjYoZMw=",
+  "owner": "openjdk",
+  "repo": "jdk17u",
+  "rev": "jdk-17.0.12+7"
+}
diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix
deleted file mode 100644
index 3576f5af8e4a..000000000000
--- a/pkgs/development/compilers/openjdk/21.nix
+++ /dev/null
@@ -1,195 +0,0 @@
-{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio
-, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
-, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
-, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk21-bootstrap
-, ensureNewerSourcesForZipFilesHook
-, setJavaClassPath
-# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
-# which should be fixable, this is a no-rebuild workaround for GHC.
-, headless ? stdenv.targetPlatform.isGhcjs
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  version = {
-    feature = "21";
-    interim = ".0.4";
-    build = "7";
-  };
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk21-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    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-+xpQtQ1IQ7btVWnENT9XS5A/2VP101/+XR3BMo8BqYI=";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk21.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      ./ignore-LegalNoticeFilePlugin-jdk18.patch
-
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-
-      # Fix build for gnumake-4.4.1:
-      #   https://github.com/openjdk/jdk/pull/12992
-      (fetchpatch {
-        name = "gnumake-4.4.1";
-        url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-        hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    postPatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-build=${version.build}"
-      "--with-version-opt=nixos"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      "--with-toolchain-type=clang"
-      # Explicitly tell Clang to compile C++ files as C++, see
-      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
-      "--with-extra-cxxflags=-xc++"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isx86_64 "--with-jvm-features=zgc"
-    ++ lib.optional headless "--enable-headless-only"
-    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "images" ];
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-
-      # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    pos = builtins.unsafeGetAttrPos "feature" version;
-    meta = import ./meta.nix lib version.feature;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch b/pkgs/development/compilers/openjdk/21/patches/fix-java-home-jdk21.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch
rename to pkgs/development/compilers/openjdk/21/patches/fix-java-home-jdk21.patch
diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch b/pkgs/development/compilers/openjdk/21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch
rename to pkgs/development/compilers/openjdk/21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch
diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json
new file mode 100644
index 000000000000..d0db28246a84
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/21/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-+xpQtQ1IQ7btVWnENT9XS5A/2VP101/+XR3BMo8BqYI=",
+  "owner": "openjdk",
+  "repo": "jdk21u",
+  "rev": "jdk-21.0.4+7"
+}
diff --git a/pkgs/development/compilers/openjdk/23.nix b/pkgs/development/compilers/openjdk/23.nix
deleted file mode 100644
index 420335b55bf6..000000000000
--- a/pkgs/development/compilers/openjdk/23.nix
+++ /dev/null
@@ -1,260 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, fetchpatch
-, fetchFromGitHub
-, pkg-config
-, autoconf
-, cpio
-, file
-, which
-, unzip
-, zip
-, perl
-, cups
-, freetype
-, alsa-lib
-, libjpeg
-, giflib
-, libpng
-, zlib
-, lcms2
-, libX11
-, libICE
-, libXrender
-, libXext
-, libXt
-, libXtst
-, libXi
-, libXinerama
-, libXcursor
-, libXrandr
-, fontconfig
-, openjdk23-bootstrap
-, ensureNewerSourcesForZipFilesHook
-, setJavaClassPath
-  # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
-  # which should be fixable, this is a no-rebuild workaround for GHC.
-, headless ? stdenv.targetPlatform.isGhcjs
-, enableJavaFX ? false
-, openjfx
-, enableGtk ? true
-, gtk3
-, glib
-, writeShellScript
-, versionCheckHook
-}:
-
-let
-
-  # Java version format:
-  # $FEATURE.$INTERIM.$UPDATE.$PATCH
-  # See
-  # https://openjdk.org/jeps/223
-  # https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/Runtime.Version.html
-  featureVersion = "23";
-  info = builtins.getAttr featureVersion (lib.importJSON ./info.json);
-  version = info.version;
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk23-bootstrap.override { gtkSupport = !headless; };
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "openjdk" + lib.optionalString headless "-headless";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "openjdk";
-    repo = info.repo;
-    rev = "jdk-${version}";
-    hash = info.hash;
-  };
-
-  nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
-  buildInputs = [
-    cpio
-    file
-    which
-    zip
-    perl
-    zlib
-    cups
-    freetype
-    alsa-lib
-    libjpeg
-    giflib
-    libpng
-    zlib
-    lcms2
-    libX11
-    libICE
-    libXrender
-    libXext
-    libXtst
-    libXt
-    libXtst
-    libXi
-    libXinerama
-    libXcursor
-    libXrandr
-    fontconfig
-    openjdk-bootstrap
-  ] ++ lib.optionals (!headless && enableGtk) [
-    gtk3
-    glib
-  ];
-
-  patches = [
-    ./fix-java-home-jdk21.patch
-    ./read-truststore-from-env-jdk10.patch
-    ./increase-javadoc-heap-jdk13.patch
-    ./ignore-LegalNoticeFilePlugin-jdk18.patch
-
-    # Fix build for gnumake-4.4.1:
-    #   https://github.com/openjdk/jdk/pull/12992
-    (fetchpatch {
-      name = "gnumake-4.4.1";
-      url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
-      hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
-    })
-  ] ++ lib.optionals (!headless && enableGtk) [
-    ./swing-use-gtk-jdk13.patch
-  ];
-
-  postPatch = ''
-    chmod +x configure
-    patchShebangs --build configure
-  '';
-
-  # JDK's build system attempts to specifically detect
-  # and special-case WSL, and we don't want it to do that,
-  # so pass the correct platform names explicitly
-  configurePlatforms = [ "build" "host" ];
-
-
-  # https://openjdk.org/groups/build/doc/building.html
-  configureFlags = [
-    "--with-boot-jdk=${openjdk-bootstrap.home}"
-    "--with-version-string=${version}"
-    "--with-vendor-version-string=(nix)"
-    "--enable-unlimited-crypto"
-    "--with-native-debug-symbols=internal"
-    "--with-libjpeg=system"
-    "--with-giflib=system"
-    "--with-libpng=system"
-    "--with-zlib=system"
-    "--with-lcms=system"
-    "--with-stdc++lib=dynamic"
-  ]
-  ++ lib.optionals stdenv.cc.isClang [
-    "--with-toolchain-type=clang"
-    # Explicitly tell Clang to compile C++ files as C++, see
-    # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
-    "--with-extra-cxxflags=-xc++"
-  ]
-  ++ lib.optional headless "--enable-headless-only"
-  ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-  separateDebugInfo = true;
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  NIX_LDFLAGS = toString (lib.optionals (!headless) [
-    "-lfontconfig"
-    "-lcups"
-    "-lXinerama"
-    "-lXrandr"
-    "-lmagic"
-  ] ++ lib.optionals (!headless && enableGtk) [
-    "-lgtk-3"
-    "-lgio-2.0"
-  ]);
-
-  # -j flag is explicitly rejected by the build system:
-  #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-  # Note: it does not make build sequential. Build system
-  # still runs in parallel.
-  enableParallelBuilding = false;
-
-  buildFlags = [ "images" ];
-
-  installPhase = ''
-    mkdir -p $out/lib
-
-    mv build/*/images/jdk $out/lib/openjdk
-
-    # Remove some broken manpages.
-    rm -rf $out/lib/openjdk/man/ja*
-
-    # Mirror some stuff in top-level.
-    mkdir -p $out/share
-    ln -s $out/lib/openjdk/include $out/include
-    ln -s $out/lib/openjdk/man $out/share/man
-
-    # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
-    ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-    # jni.h expects jni_md.h to be in the header search path.
-    ln -s $out/include/linux/*_md.h $out/include/
-
-    # Remove crap from the installation.
-    rm -rf $out/lib/openjdk/demo
-    ${lib.optionalString headless ''
-      rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-    ''}
-
-    ln -s $out/lib/openjdk/bin $out/bin
-  '';
-
-  preFixup = ''
-    # Propagate the setJavaClassPath setup hook so that any package
-    # that depends on the JDK has $CLASSPATH set up properly.
-    mkdir -p $out/nix-support
-    #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-    echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    mkdir -p $out/nix-support
-    cat <<EOF > $out/nix-support/setup-hook
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-    EOF
-  '';
-
-  postFixup = ''
-    # Build the set of output library directories to rpath against
-    LIBDIRS=""
-    for output in $(getAllOutputNames); do
-      if [ "$output" = debug ]; then continue; fi
-      LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
-    done
-    # Add the local library paths to remove dependencies on the bootstrap
-    for output in $(getAllOutputNames); do
-      if [ "$output" = debug ]; then continue; fi
-      OUTPUTDIR=$(eval echo \$$output)
-      BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-      echo "$BINLIBS" | while read i; do
-        patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-        patchelf --shrink-rpath "$i" || true
-      done
-    done
-  '';
-
-  disallowedReferences = [ openjdk-bootstrap ];
-
-  pos = __curPos;
-  meta = import ./meta.nix lib featureVersion;
-
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  versionCheckProgram = "${placeholder "out"}/bin/java";
-
-  doInstallCheck = true;
-
-  passthru = {
-    home = "${finalAttrs.finalPackage}/lib/openjdk";
-
-    inherit gtk3;
-  };
-})
diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json
new file mode 100644
index 000000000000..b47426326ecd
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/23/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-lcLnWAiskWindOqWmOWiIHiYKXGSJZK4d20k19QZfrE=",
+  "owner": "openjdk",
+  "repo": "jdk23u",
+  "rev": "jdk-23-ga"
+}
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
deleted file mode 100644
index 831d5e8d49c3..000000000000
--- a/pkgs/development/compilers/openjdk/8.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, lndir, bash, cpio, file, which, unzip, zip
-, cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
-, libjpeg, giflib
-, openjdk8-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableGtk ? true, gtk2, glib
-}:
-
-let
-
-  /**
-   * The JRE libraries are in directories that depend on the CPU.
-   */
-  architecture = {
-    i686-linux = "i386";
-    x86_64-linux = "amd64";
-    aarch64-linux = "aarch64";
-    powerpc64le-linux = "ppc64le";
-  }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}");
-
-  update = "422";
-  build = "ga";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk8-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk8 = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "8u${update}-${build}";
-
-    src = fetchFromGitHub {
-      owner = "openjdk";
-      repo = "jdk8u";
-      rev = "jdk${version}";
-      hash = "sha256-uMo1DIkji+FPTbFRwURXybkLE5xv+teSClWP9RfAvfo=";
-    };
-    outputs = [ "out" "jre" ];
-
-    nativeBuildInputs = [ pkg-config lndir unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib
-      libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk2 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk8.patch
-      ./read-truststore-from-env-jdk8.patch
-      ./currency-date-range-jdk8.patch
-      ./fix-library-path-jdk8.patch
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk8.patch
-    ];
-
-    # Hotspot cares about the host(!) version otherwise
-    DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok";
-
-    preConfigure = ''
-      chmod +x configure
-      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-      substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}"
-      substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
-    '';
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-update-version=${update}"
-      "--with-build-number=${build}"
-      "--with-milestone=fcs"
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--disable-freetype-bundling"
-      "--with-zlib=system"
-      "--with-giflib=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--disable-headful";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = toString ([
-      # glibc 2.24 deprecated readdir_r so we need this
-      # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
-      "-Wno-error=deprecated-declarations"
-    ] ++ lib.optionals stdenv.cc.isGNU [
-      # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
-      # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
-      "-fno-lifetime-dse"
-      "-fno-delete-null-pointer-checks"
-      "-std=gnu++98"
-      "-Wno-error"
-    ]);
-
-    NIX_LDFLAGS= toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-x11-2.0" "-lgio-2.0"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    doCheck = false; # fails with "No rule to make target 'y'."
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/j2sdk-image $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
-        rm $out/lib/openjdk/jre/bin/policytool
-        rm $out/lib/openjdk/bin/{policytool,appletviewer}
-      ''}
-
-      # Move the JRE to a separate output
-      mkdir -p $jre/lib/openjdk
-      mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
-      mkdir $out/lib/openjdk/jre
-      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
-
-      # Make sure cmm/*.pf are not symlinks:
-      # https://youtrack.jetbrains.com/issue/IDEA-147272
-      rm -rf $out/lib/openjdk/jre/lib/cmm
-      ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
-
-      # Setup fallback fonts
-      ${lib.optionalString (!headless) ''
-        mkdir -p $jre/lib/openjdk/jre/lib/fonts
-        ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
-      ''}
-
-      # Remove duplicate binaries.
-      for i in $(cd $out/lib/openjdk/bin && echo *); do
-        if [ "$i" = java ]; then continue; fi
-        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
-          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
-        fi
-      done
-
-      # Generate certificates.
-      (
-        cd $jre/lib/openjdk/jre/lib/security
-        rm cacerts
-        perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
-      )
-
-      ln -s $out/lib/openjdk/bin $out/bin
-      ln -s $jre/lib/openjdk/jre/bin $jre/bin
-      ln -s $jre/lib/openjdk/jre $out/jre
-    '';
-
-    propagatedBuildInputs = [ setJavaClassPath ];
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook from the JRE so that
-      # any package that depends on the JRE has $CLASSPATH set up
-      # properly.
-      mkdir -p $jre/nix-support
-      printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk8-bootstrap ];
-
-    meta = with lib; {
-      homepage = "http://openjdk.java.net/";
-      license = licenses.gpl2;
-      description = "Open-source Java Development Kit";
-      maintainers = with maintainers; [ edwtjo ];
-      platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
-      mainProgram = "java";
-      # Broken for musl at 2024-01-17. Tracking issue:
-      # https://github.com/NixOS/nixpkgs/issues/281618
-      # error: ‘isnanf’ was not declared in this scope
-      broken = stdenv.hostPlatform.isMusl;
-    };
-
-    passthru = {
-      inherit architecture;
-      home = "${openjdk8}/lib/openjdk";
-      inherit gtk2;
-    };
-  };
-in openjdk8
diff --git a/pkgs/development/compilers/openjdk/generate-cacerts.pl b/pkgs/development/compilers/openjdk/8/generate-cacerts.pl
similarity index 100%
rename from pkgs/development/compilers/openjdk/generate-cacerts.pl
rename to pkgs/development/compilers/openjdk/8/generate-cacerts.pl
diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/currency-date-range-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/currency-date-range-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/fix-java-home-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/fix-java-home-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/fix-library-path-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/fix-library-path-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/read-truststore-from-env-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/read-truststore-from-env-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/swing-use-gtk-jdk8.patch
similarity index 100%
rename from pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch
rename to pkgs/development/compilers/openjdk/8/patches/swing-use-gtk-jdk8.patch
diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json
new file mode 100644
index 000000000000..47ad1dc0596a
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/8/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-uMo1DIkji+FPTbFRwURXybkLE5xv+teSClWP9RfAvfo=",
+  "owner": "openjdk",
+  "repo": "jdk8u",
+  "rev": "jdk8u422-ga"
+}
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 9aba729061c6..00a66512161e 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -1,125 +1,216 @@
 {
-  stdenv,
+  featureVersion,
+
   lib,
+  stdenv,
+
+  fetchFromGitHub,
   fetchurl,
   fetchpatch,
-  fetchFromGitHub,
+
   pkg-config,
   autoconf,
+  lndir,
+  unzip,
+  ensureNewerSourcesForZipFilesHook,
+
   cpio,
   file,
   which,
-  unzip,
   zip,
   perl,
+  zlib,
   cups,
   freetype,
+  harfbuzz,
   alsa-lib,
   libjpeg,
   giflib,
   libpng,
-  zlib,
   lcms2,
   libX11,
   libICE,
-  libXrender,
   libXext,
-  libXt,
+  libXrender,
   libXtst,
+  libXt,
   libXi,
   libXinerama,
   libXcursor,
   libXrandr,
   fontconfig,
-  openjdk23-bootstrap,
-  ensureNewerSourcesForZipFilesHook,
+
   setJavaClassPath,
+
+  versionCheckHook,
+
+  bash,
+  liberation_ttf,
+  cacert,
+
   # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
   # which should be fixable, this is a no-rebuild workaround for GHC.
-  headless ? stdenv.targetPlatform.isGhcjs,
+  headless ? lib.versionAtLeast featureVersion "21" && stdenv.targetPlatform.isGhcjs,
+
   enableJavaFX ? false,
-  openjfx,
+  openjfx17,
+  openjfx21,
+  openjfx23,
+  openjfx_jdk ?
+    {
+      "17" = openjfx17;
+      "21" = openjfx21;
+      "23" = openjfx23;
+    }
+    .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
+
   enableGtk ? true,
   gtk3,
+  gtk2,
   glib,
-  writeShellScript,
-  versionCheckHook,
+
+  temurin-bin-8,
+  temurin-bin-11,
+  temurin-bin-17,
+  temurin-bin-21,
+  temurin-bin-23,
+  jdk-bootstrap ?
+    {
+      "8" = temurin-bin-8;
+      "11" = temurin-bin-11;
+      "17" = temurin-bin-17;
+      "21" = temurin-bin-21;
+      "23" = temurin-bin-23;
+    }
+    .${featureVersion},
 }:
 
 let
+  sourceFile = ./. + "/${featureVersion}/source.json";
+  sourceInfo = lib.importJSON sourceFile;
 
-  # Java version format:
-  # $FEATURE.$INTERIM.$UPDATE.$PATCH
-  # See
-  # https://openjdk.org/jeps/223
-  # https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/Runtime.Version.html
-  featureVersion = "23";
-  info = builtins.getAttr featureVersion (lib.importJSON ./info.json);
-  version = info.version;
+  atLeast11 = lib.versionAtLeast featureVersion "11";
+  atLeast17 = lib.versionAtLeast featureVersion "17";
+  atLeast21 = lib.versionAtLeast featureVersion "21";
+  atLeast23 = lib.versionAtLeast featureVersion "23";
 
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk23-bootstrap.override { gtkSupport = !headless; };
+  tagPrefix = if atLeast11 then "jdk-" else "jdk";
+  # TODO: Merge these `lib.removePrefix` calls once update scripts have
+  # been run.
+  version = lib.removePrefix tagPrefix (lib.removePrefix "refs/tags/" sourceInfo.rev);
+  versionSplit =
+    # TODO: Remove `-ga` logic once update scripts have been run.
+    builtins.match (if atLeast11 then "(.+)[-+](.+)" else "(.+)-b?(.+)") version;
+  versionBuild = lib.elemAt versionSplit 1;
+
+  # The JRE 8 libraries are in directories that depend on the CPU.
+  architecture =
+    if atLeast11 then
+      ""
+    else
+      {
+        i686-linux = "i386";
+        x86_64-linux = "amd64";
+        aarch64-linux = "aarch64";
+        powerpc64le-linux = "ppc64le";
+      }
+      .${stdenv.system} or (throw "Unsupported platform ${stdenv.system}");
+
+  jdk-bootstrap' = jdk-bootstrap.override {
+    # when building a headless jdk, also bootstrap it with a headless jdk
+    gtkSupport = !headless;
+  };
 in
 
+assert lib.assertMsg (lib.pathExists sourceFile)
+  "OpenJDK ${featureVersion} is not a supported version";
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "openjdk" + lib.optionalString headless "-headless";
   inherit version;
 
-  src = fetchFromGitHub {
-    owner = "openjdk";
-    repo = info.repo;
-    rev = "jdk-${version}";
-    hash = info.hash;
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    autoconf
-    unzip
-    ensureNewerSourcesForZipFilesHook
-  ];
-  buildInputs =
+  outputs =
     [
-      cpio
-      file
-      which
-      zip
-      perl
-      zlib
-      cups
-      freetype
-      alsa-lib
-      libjpeg
-      giflib
-      libpng
-      zlib
-      lcms2
-      libX11
-      libICE
-      libXrender
-      libXext
-      libXtst
-      libXt
-      libXtst
-      libXi
-      libXinerama
-      libXcursor
-      libXrandr
-      fontconfig
-      openjdk-bootstrap
+      "out"
     ]
-    ++ lib.optionals (!headless && enableGtk) [
-      gtk3
-      glib
+    ++ lib.optionals (!atLeast11) [
+      "jre"
     ];
 
+  src = fetchFromGitHub {
+    inherit (sourceInfo) owner repo rev hash;
+  };
+
   patches =
     [
-      ./fix-java-home-jdk21.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      ./ignore-LegalNoticeFilePlugin-jdk18.patch
-
+      (
+        if atLeast21 then
+          ./21/patches/fix-java-home-jdk21.patch
+        else if atLeast11 then
+          ./11/patches/fix-java-home-jdk10.patch
+        else
+          ./8/patches/fix-java-home-jdk8.patch
+      )
+      (
+        if atLeast11 then
+          ./11/patches/read-truststore-from-env-jdk10.patch
+        else
+          ./8/patches/read-truststore-from-env-jdk8.patch
+      )
+    ]
+    ++ lib.optionals (!atLeast23) [
+      (
+        if atLeast11 then
+          ./11/patches/currency-date-range-jdk10.patch
+        else
+          ./8/patches/currency-date-range-jdk8.patch
+      )
+    ]
+    ++ lib.optionals atLeast11 [
+      (
+        if atLeast17 then
+          ./17/patches/increase-javadoc-heap-jdk13.patch
+        else
+          ./11/patches/increase-javadoc-heap.patch
+      )
+    ]
+    ++ lib.optionals atLeast17 [
+      (
+        if atLeast21 then
+          ./21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch
+        else
+          ./17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch
+      )
+    ]
+    ++ lib.optionals (!atLeast21) [
+      (
+        if atLeast17 then
+          ./17/patches/fix-library-path-jdk17.patch
+        else if atLeast11 then
+          ./11/patches/fix-library-path-jdk11.patch
+        else
+          ./8/patches/fix-library-path-jdk8.patch
+      )
+    ]
+    ++ lib.optionals (atLeast17 && !atLeast23) [
+      # -Wformat etc. are stricter in newer gccs, per
+      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
+      # so grab the work-around from
+      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
+      (fetchurl {
+        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
+        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
+      })
+    ]
+    ++ lib.optionals (featureVersion == "17") [
+      # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
+      # This is applied anywhere to prevent patchrot.
+      (fetchurl {
+        url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
+        sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
+      })
+    ]
+    ++ lib.optionals atLeast11 [
       # Fix build for gnumake-4.4.1:
       #   https://github.com/openjdk/jdk/pull/12992
       (fetchpatch {
@@ -128,19 +219,107 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
     ]
+    ++ lib.optionals (featureVersion == "17") [
+      # Backport fixes for musl 1.2.4 which are already applied in jdk21+
+      # Fetching patch from chimera because they already went through the effort of rebasing it onto jdk17
+      (fetchurl {
+        name = "lfs64.patch";
+        url = "https://raw.githubusercontent.com/chimera-linux/cports/4614075d19e9c9636f3f7e476687247f63330a35/contrib/openjdk17/patches/lfs64.patch";
+        hash = "sha256-t2mRbdEiumBAbIAC0zsJNwCn59WYWHsnRtuOSL6bWB4=";
+      })
+    ]
     ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk13.patch
+      (
+        if atLeast17 then
+          ./17/patches/swing-use-gtk-jdk13.patch
+        else if atLeast11 then
+          ./11/patches/swing-use-gtk-jdk10.patch
+        else
+          ./8/patches/swing-use-gtk-jdk8.patch
+      )
     ];
 
-  postPatch = ''
-    chmod +x configure
-    patchShebangs --build configure
-  '';
+  nativeBuildInputs =
+    [
+      pkg-config
+    ]
+    ++ lib.optionals atLeast11 [
+      autoconf
+    ]
+    ++ lib.optionals (!atLeast11) [
+      lndir
+    ]
+    ++ [
+      unzip
+    ]
+    ++ lib.optionals atLeast21 [
+      ensureNewerSourcesForZipFilesHook
+    ];
+
+  buildInputs =
+    [
+      # TODO: Many of these should likely be in `nativeBuildInputs`.
+      cpio
+      file
+      which
+      zip
+      perl
+      zlib
+      cups
+      freetype
+    ]
+    ++ lib.optionals (atLeast11 && !atLeast21) [
+      harfbuzz
+    ]
+    ++ [
+      alsa-lib
+      libjpeg
+      giflib
+    ]
+    ++ lib.optionals atLeast11 [
+      libpng
+      zlib # duplicate
+      lcms2
+    ]
+    ++ [
+      libX11
+      libICE
+    ]
+    ++ lib.optionals (!atLeast11) [
+      libXext
+    ]
+    ++ [
+      libXrender
+    ]
+    ++ lib.optionals atLeast11 [
+      libXext
+    ]
+    ++ [
+      libXtst
+      libXt
+      libXtst # duplicate
+      libXi
+      libXinerama
+      libXcursor
+      libXrandr
+      fontconfig
+      jdk-bootstrap'
+    ]
+    ++ lib.optionals (!headless && enableGtk) [
+      (if atLeast11 then gtk3 else gtk2)
+      glib
+    ];
+
+  propagatedBuildInputs = lib.optionals (!atLeast11) [ setJavaClassPath ];
+
+  nativeInstallCheckInputs = lib.optionals atLeast23 [
+    versionCheckHook
+  ];
 
   # JDK's build system attempts to specifically detect
   # and special-case WSL, and we don't want it to do that,
   # so pass the correct platform names explicitly
-  configurePlatforms = [
+  ${if atLeast17 then "configurePlatforms" else null} = [
     "build"
     "host"
   ];
@@ -148,101 +327,280 @@ stdenv.mkDerivation (finalAttrs: {
   # https://openjdk.org/groups/build/doc/building.html
   configureFlags =
     [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-string=${version}"
-      "--with-vendor-version-string=(nix)"
+      "--with-boot-jdk=${jdk-bootstrap'.home}"
+    ]
+    ++ (
+      if atLeast23 then
+        [
+          "--with-version-string=${version}"
+          "--with-vendor-version-string=(nix)"
+        ]
+      else if atLeast11 then
+        lib.optionals atLeast17 [
+          "--with-version-build=${versionBuild}"
+          "--with-version-opt=nixos"
+        ]
+        ++ [
+          "--with-version-pre="
+        ]
+      else
+        [
+          "--with-update-version=${lib.removePrefix "${featureVersion}u" (lib.elemAt versionSplit 0)}"
+          "--with-build-number=${versionBuild}"
+          "--with-milestone=fcs"
+        ]
+    )
+    ++ [
       "--enable-unlimited-crypto"
       "--with-native-debug-symbols=internal"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
+    ]
+    ++ lib.optionals (!atLeast21) (
+      if atLeast11 then
+        [
+          "--with-freetype=system"
+          "--with-harfbuzz=system"
+        ]
+      else
+        [
+          "--disable-freetype-bundling"
+        ]
+    )
+    ++ (
+      if atLeast11 then
+        [
+          "--with-libjpeg=system"
+          "--with-giflib=system"
+          "--with-libpng=system"
+          "--with-zlib=system"
+          "--with-lcms=system"
+        ]
+      else
+        [
+          "--with-zlib=system"
+          "--with-giflib=system"
+        ]
+    )
+    ++ [
       "--with-stdc++lib=dynamic"
     ]
-    ++ lib.optionals stdenv.cc.isClang [
+    ++ lib.optionals (featureVersion == "11") [
+      "--disable-warnings-as-errors"
+    ]
+    # OpenJDK 11 cannot be built by recent versions of Clang, as far as I can tell (see
+    # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to
+    # compile with LLVM 12.
+    ++ lib.optionals (atLeast11 && stdenv.cc.isClang) [
       "--with-toolchain-type=clang"
       # Explicitly tell Clang to compile C++ files as C++, see
       # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
       "--with-extra-cxxflags=-xc++"
     ]
-    ++ lib.optional headless "--enable-headless-only"
-    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    # This probably shouldn’t apply to OpenJDK 21; see
+    # b7e68243306833845cbf92e2ea1e0cf782481a51 which removed it for
+    # versions 15 through 20.
+    ++ lib.optional (
+      (featureVersion == "11" || featureVersion == "21") && stdenv.hostPlatform.isx86_64
+    ) "--with-jvm-features=zgc"
+    ++ lib.optional headless (if atLeast11 then "--enable-headless-only" else "--disable-headful")
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx_jdk}";
+
+  buildFlags = if atLeast17 then [ "images" ] else [ "all" ];
 
   separateDebugInfo = true;
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  NIX_LDFLAGS = toString (
-    lib.optionals (!headless) [
-      "-lfontconfig"
-      "-lcups"
-      "-lXinerama"
-      "-lXrandr"
-      "-lmagic"
-    ]
-    ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3"
-      "-lgio-2.0"
-    ]
-  );
-
   # -j flag is explicitly rejected by the build system:
   #     Error: 'make -jN' is not supported, use 'make JOBS=N'
   # Note: it does not make build sequential. Build system
   # still runs in parallel.
   enableParallelBuilding = false;
 
-  buildFlags = [ "images" ];
+  env =
+    {
+      NIX_CFLAGS_COMPILE =
+        if atLeast17 then
+          "-Wno-error"
+        else if atLeast11 then
+          # Workaround for
+          # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
+          # when building jtreg
+          "-Wformat"
+        else
+          lib.concatStringsSep " " (
+            [
+              # glibc 2.24 deprecated readdir_r so we need this
+              # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
+              "-Wno-error=deprecated-declarations"
+            ]
+            ++ lib.optionals stdenv.cc.isGNU [
+              # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+              # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
+              "-fno-lifetime-dse"
+              "-fno-delete-null-pointer-checks"
+              "-std=gnu++98"
+              "-Wno-error"
+            ]
+          );
 
-  installPhase = ''
-    mkdir -p $out/lib
+      NIX_LDFLAGS = lib.concatStringsSep " " (
+        lib.optionals (!headless) [
+          "-lfontconfig"
+          "-lcups"
+          "-lXinerama"
+          "-lXrandr"
+          "-lmagic"
+        ]
+        ++ lib.optionals (!headless && enableGtk) [
+          (if atLeast11 then "-lgtk-3" else "-lgtk-x11-2.0")
+          "-lgio-2.0"
+        ]
+      );
+    }
+    // lib.optionalAttrs (!atLeast11) {
+      # OpenJDK 8 Hotspot cares about the host(!) version otherwise
+      DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok";
+    };
 
-    mv build/*/images/jdk $out/lib/openjdk
+  ${if atLeast23 then "versionCheckProgram" else null} = "${placeholder "out"}/bin/java";
 
-    # Remove some broken manpages.
-    rm -rf $out/lib/openjdk/man/ja*
+  ${if !atLeast11 then "doCheck" else null} = false; # fails with "No rule to make target 'y'."
 
-    # Mirror some stuff in top-level.
-    mkdir -p $out/share
-    ln -s $out/lib/openjdk/include $out/include
-    ln -s $out/lib/openjdk/man $out/share/man
+  doInstallCheck = atLeast23;
 
-    # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
-    ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-    # jni.h expects jni_md.h to be in the header search path.
-    ln -s $out/include/linux/*_md.h $out/include/
-
-    # Remove crap from the installation.
-    rm -rf $out/lib/openjdk/demo
-    ${lib.optionalString headless ''
-      rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-    ''}
-
-    ln -s $out/lib/openjdk/bin $out/bin
+  ${if atLeast17 then "postPatch" else null} = ''
+    chmod +x configure
+    patchShebangs --build configure
   '';
 
-  preFixup = ''
-    # Propagate the setJavaClassPath setup hook so that any package
-    # that depends on the JDK has $CLASSPATH set up properly.
-    mkdir -p $out/nix-support
-    #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-    echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
+  ${if !atLeast17 then "preConfigure" else null} =
+    ''
+      chmod +x configure
+      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
+    ''
+    + lib.optionalString (!atLeast11) ''
+      substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}"
+      substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
+    '';
 
-    # Set JAVA_HOME automatically.
-    mkdir -p $out/nix-support
-    cat <<EOF > $out/nix-support/setup-hook
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-    EOF
-  '';
+  installPhase =
+    ''
+      mkdir -p $out/lib
+
+      mv build/*/images/${if atLeast11 then "jdk" else "j2sdk-image"} $out/lib/openjdk
+
+      # Remove some broken manpages.
+      rm -rf $out/lib/openjdk/man/ja*
+
+      # Mirror some stuff in top-level.
+      mkdir -p $out/share
+      ln -s $out/lib/openjdk/include $out/include
+      ln -s $out/lib/openjdk/man $out/share/man
+    ''
+    + lib.optionalString atLeast17 ''
+
+      # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081)
+    ''
+    + lib.optionalString atLeast11 ''
+      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
+    ''
+    + ''
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/linux/*_md.h $out/include/
+
+      # Remove crap from the installation.
+      rm -rf $out/lib/openjdk/demo${lib.optionalString (!atLeast11) " $out/lib/openjdk/sample"}
+      ${lib.optionalString headless (
+        if atLeast11 then
+          ''
+            rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
+          ''
+        else
+          ''
+            rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
+            rm $out/lib/openjdk/jre/bin/policytool
+            rm $out/lib/openjdk/bin/{policytool,appletviewer}
+          ''
+      )}
+    ''
+    + lib.optionalString (!atLeast11) ''
+
+      # Move the JRE to a separate output
+      mkdir -p $jre/lib/openjdk
+      mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
+      mkdir $out/lib/openjdk/jre
+      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+
+      # Make sure cmm/*.pf are not symlinks:
+      # https://youtrack.jetbrains.com/issue/IDEA-147272
+      rm -rf $out/lib/openjdk/jre/lib/cmm
+      ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+
+      # Setup fallback fonts
+      ${lib.optionalString (!headless) ''
+        mkdir -p $jre/lib/openjdk/jre/lib/fonts
+        ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
+      ''}
+
+      # Remove duplicate binaries.
+      for i in $(cd $out/lib/openjdk/bin && echo *); do
+        if [ "$i" = java ]; then continue; fi
+        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
+          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
+        fi
+      done
+
+      # Generate certificates.
+      (
+        cd $jre/lib/openjdk/jre/lib/security
+        rm cacerts
+        perl ${./8/generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
+      )
+    ''
+    + ''
+
+      ln -s $out/lib/openjdk/bin $out/bin
+    ''
+    + lib.optionalString (!atLeast11) ''
+      ln -s $jre/lib/openjdk/jre/bin $jre/bin
+      ln -s $jre/lib/openjdk/jre $out/jre
+    '';
+
+  preFixup =
+    (
+      if atLeast11 then
+        ''
+          # Propagate the setJavaClassPath setup hook so that any package
+          # that depends on the JDK has $CLASSPATH set up properly.
+          mkdir -p $out/nix-support
+          #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
+          echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
+        ''
+      else
+        ''
+          # Propagate the setJavaClassPath setup hook from the JRE so that
+          # any package that depends on the JRE has $CLASSPATH set up
+          # properly.
+          mkdir -p $jre/nix-support
+          printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
+        ''
+    )
+    + ''
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat <<EOF > $out/nix-support/setup-hook
+      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+      EOF
+    '';
 
   postFixup = ''
     # Build the set of output library directories to rpath against
     LIBDIRS=""
     for output in $(getAllOutputNames); do
       if [ "$output" = debug ]; then continue; fi
-      LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
+      LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | ${
+        if atLeast17 then "sort -u" else "sort | uniq"
+      } | tr '\n' ':'):$LIBDIRS"
     done
     # Add the local library paths to remove dependencies on the bootstrap
     for output in $(getAllOutputNames); do
@@ -256,21 +614,45 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  disallowedReferences = [ openjdk-bootstrap ];
-
-  pos = __curPos;
-  meta = import ./meta.nix lib featureVersion;
-
-  nativeInstallCheckInputs = [
-    versionCheckHook
+  # TODO: The OpenJDK 8 derivation got this wrong.
+  disallowedReferences = [
+    (if atLeast11 then jdk-bootstrap' else jdk-bootstrap)
   ];
-  versionCheckProgram = "${placeholder "out"}/bin/java";
 
-  doInstallCheck = true;
+  passthru =
+    {
+      home = "${finalAttrs.finalPackage}/lib/openjdk";
 
-  passthru = {
-    home = "${finalAttrs.finalPackage}/lib/openjdk";
+      inherit jdk-bootstrap;
+    }
+    // (if atLeast11 then { inherit gtk3; } else { inherit gtk2; })
+    // lib.optionalAttrs (!atLeast23) {
+      inherit architecture;
+    };
 
-    inherit gtk3;
+  meta = {
+    description = "Open-source Java Development Kit";
+    homepage = "https://openjdk.java.net/";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
+      edwtjo
+      infinidoge
+    ];
+    mainProgram = "java";
+    platforms =
+      [
+        "i686-linux"
+        "x86_64-linux"
+        "aarch64-linux"
+      ]
+      ++ lib.optionals atLeast11 [
+        "armv7l-linux"
+        "armv6l-linux"
+        "powerpc64le-linux"
+      ];
+    # OpenJDK 8 was broken for musl at 2024-01-17. Tracking issue:
+    # https://github.com/NixOS/nixpkgs/issues/281618
+    # error: ‘isnanf’ was not declared in this scope
+    broken = !atLeast11 && stdenv.hostPlatform.isMusl;
   };
 })
diff --git a/pkgs/development/compilers/openjdk/info.json b/pkgs/development/compilers/openjdk/info.json
deleted file mode 100644
index 3bfa23fb0e49..000000000000
--- a/pkgs/development/compilers/openjdk/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "23": {
-    "version": "23-ga",
-    "repo":    "jdk23u",
-    "hash":    "sha256-lcLnWAiskWindOqWmOWiIHiYKXGSJZK4d20k19QZfrE="
-  }
-}
diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix
deleted file mode 100644
index 04ed684eefab..000000000000
--- a/pkgs/development/compilers/openjdk/meta.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-lib: version: with lib; {
-  homepage = "https://openjdk.java.net/";
-  license = licenses.gpl2Only;
-  description = "Open-source Java Development Kit";
-  maintainers = with maintainers; [ edwtjo infinidoge ];
-  platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ];
-  mainProgram = "java";
-  knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" "19" "20" ]) [
-    "This OpenJDK version has reached its end of life."
-  ];
-}
diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix
index 925fc8d5b29d..e0c79ed08f77 100644
--- a/pkgs/development/tools/scenic-view/default.nix
+++ b/pkgs/development/tools/scenic-view/default.nix
@@ -2,7 +2,7 @@
 let
   jdk = openjdk.override (lib.optionalAttrs stdenv.hostPlatform.isLinux {
     enableJavaFX = true;
-    openjfx = openjfx.override { withWebKit = true; };
+    openjfx_jdk = openjfx.override { withWebKit = true; };
   });
 
   pname = "scenic-view";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7005036ab68..534b09999bd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28352,7 +28352,7 @@ with pkgs;
   bluej = callPackage ../applications/editors/bluej {
     openjdk = openjdk17.override {
       enableJavaFX = true;
-      openjfx = openjfx17.override { withWebKit = true; };
+      openjfx_jdk = openjfx17.override { withWebKit = true; };
     };
   };
 
@@ -28999,7 +28999,7 @@ with pkgs;
   greenfoot = callPackage ../applications/editors/greenfoot {
     openjdk = openjdk17.override {
       enableJavaFX = true;
-      openjfx = openjfx17.override { withWebKit = true; };
+      openjfx_jdk = openjfx17.override { withWebKit = true; };
     };
   };
 
@@ -30274,7 +30274,7 @@ with pkgs;
   jabref = callPackage ../applications/office/jabref {
     jdk = jdk21.override {
       enableJavaFX = true;
-      openjfx = openjfx23.override { withWebKit = true; };
+      openjfx_jdk = openjfx23.override { withWebKit = true; };
     };
   };
 
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index eb549d0d21d1..7c270d134cfb 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -11,15 +11,15 @@ in {
   inherit openjfx17 openjfx21 openjfx23;
 
   compiler = let
-    mkOpenjdk = path-linux: path-darwin: args:
+    mkOpenjdk = featureVersion: path-darwin:
       if stdenv.hostPlatform.isLinux
-      then mkOpenjdkLinuxOnly path-linux args
+      then mkOpenjdkLinuxOnly featureVersion
       else let
         openjdk = callPackage path-darwin {};
       in openjdk // { headless = openjdk; };
 
-    mkOpenjdkLinuxOnly = path-linux: args: let
-      openjdk = callPackage path-linux (args);
+    mkOpenjdkLinuxOnly = featureVersion: let
+      openjdk = callPackage ../development/compilers/openjdk/generic.nix { inherit featureVersion; };
     in assert stdenv.hostPlatform.isLinux; openjdk // {
       headless = openjdk.override { headless = true; };
     };
@@ -29,45 +29,16 @@ in {
     corretto17 = callPackage ../development/compilers/corretto/17.nix { };
     corretto21 = callPackage ../development/compilers/corretto/21.nix { };
 
-    openjdk8-bootstrap = temurin-bin.jdk-8;
+    openjdk8 = mkOpenjdk "8" ../development/compilers/zulu/8.nix;
+    openjdk11 = mkOpenjdk "11" ../development/compilers/zulu/11.nix;
+    openjdk17 = mkOpenjdk "17" ../development/compilers/zulu/17.nix;
+    openjdk21 = mkOpenjdk "21" ../development/compilers/zulu/21.nix;
+    openjdk23 = mkOpenjdk "23" ../development/compilers/zulu/23.nix;
 
-    openjdk11-bootstrap = temurin-bin.jdk-11;
-
-    openjdk17-bootstrap = temurin-bin.jdk-17;
-
-    openjdk8 = mkOpenjdk
-      ../development/compilers/openjdk/8.nix
-      ../development/compilers/zulu/8.nix
-      { };
-
-    openjdk11 = mkOpenjdk
-      ../development/compilers/openjdk/11.nix
-      ../development/compilers/zulu/11.nix
-      { openjfx = throw "JavaFX is not supported on OpenJDK 11"; };
-
-    openjdk17 = mkOpenjdk
-      ../development/compilers/openjdk/17.nix
-      ../development/compilers/zulu/17.nix
-      {
-        inherit openjdk17-bootstrap;
-        openjfx = openjfx17;
-      };
-
-    openjdk21 = mkOpenjdk
-      ../development/compilers/openjdk/21.nix
-      ../development/compilers/zulu/21.nix
-      {
-        openjdk21-bootstrap = temurin-bin.jdk-21;
-        openjfx = openjfx21;
-      };
-
-    openjdk23 = mkOpenjdk
-      ../development/compilers/openjdk/23.nix
-      ../development/compilers/zulu/23.nix
-      {
-        openjdk23-bootstrap = temurin-bin.jdk-23;
-        openjfx = openjfx23;
-      };
+    # Legacy aliases
+    openjdk8-bootstrap = openjdk8.jdk-bootstrap;
+    openjdk11-bootstrap = openjdk11.jdk-bootstrap;
+    openjdk17-bootstrap = openjdk17.jdk-bootstrap;
 
     temurin-bin = recurseIntoAttrs (callPackage (
       if stdenv.hostPlatform.isLinux