From f2569008ab1ab7dae2e2d28c58be6705805e89d6 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 6 Oct 2024 03:44:39 +0100 Subject: [PATCH] openjfx{17,21,23}: move to `pkgs/by-name` --- .../openjdk => by-name/op}/openjfx/17/deps.json | 0 .../17/patches/backport-ffmpeg-6-support-jfx11.patch | 0 .../17/patches/backport-ffmpeg-7-support-jfx11.patch | 0 .../openjdk => by-name/op}/openjfx/17/source.json | 0 .../openjdk => by-name/op}/openjfx/21/deps.json | 0 .../21/patches/backport-ffmpeg-7-support-jfx21.patch | 0 .../openjdk => by-name/op}/openjfx/21/source.json | 0 .../openjdk => by-name/op}/openjfx/23/deps.json | 0 .../openjdk => by-name/op}/openjfx/23/source.json | 0 .../generic.nix => by-name/op/openjfx/package.nix} | 0 pkgs/top-level/all-packages.nix | 5 +++-- pkgs/top-level/java-packages.nix | 9 ++------- 12 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/17/deps.json (100%) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/17/patches/backport-ffmpeg-6-support-jfx11.patch (100%) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/17/patches/backport-ffmpeg-7-support-jfx11.patch (100%) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/17/source.json (100%) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/21/deps.json (100%) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/21/patches/backport-ffmpeg-7-support-jfx21.patch (100%) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/21/source.json (100%) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/23/deps.json (100%) rename pkgs/{development/compilers/openjdk => by-name/op}/openjfx/23/source.json (100%) rename pkgs/{development/compilers/openjdk/openjfx/generic.nix => by-name/op/openjfx/package.nix} (100%) diff --git a/pkgs/development/compilers/openjdk/openjfx/17/deps.json b/pkgs/by-name/op/openjfx/17/deps.json similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/17/deps.json rename to pkgs/by-name/op/openjfx/17/deps.json diff --git a/pkgs/development/compilers/openjdk/openjfx/17/patches/backport-ffmpeg-6-support-jfx11.patch b/pkgs/by-name/op/openjfx/17/patches/backport-ffmpeg-6-support-jfx11.patch similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/17/patches/backport-ffmpeg-6-support-jfx11.patch rename to pkgs/by-name/op/openjfx/17/patches/backport-ffmpeg-6-support-jfx11.patch diff --git a/pkgs/development/compilers/openjdk/openjfx/17/patches/backport-ffmpeg-7-support-jfx11.patch b/pkgs/by-name/op/openjfx/17/patches/backport-ffmpeg-7-support-jfx11.patch similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/17/patches/backport-ffmpeg-7-support-jfx11.patch rename to pkgs/by-name/op/openjfx/17/patches/backport-ffmpeg-7-support-jfx11.patch diff --git a/pkgs/development/compilers/openjdk/openjfx/17/source.json b/pkgs/by-name/op/openjfx/17/source.json similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/17/source.json rename to pkgs/by-name/op/openjfx/17/source.json diff --git a/pkgs/development/compilers/openjdk/openjfx/21/deps.json b/pkgs/by-name/op/openjfx/21/deps.json similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/21/deps.json rename to pkgs/by-name/op/openjfx/21/deps.json diff --git a/pkgs/development/compilers/openjdk/openjfx/21/patches/backport-ffmpeg-7-support-jfx21.patch b/pkgs/by-name/op/openjfx/21/patches/backport-ffmpeg-7-support-jfx21.patch similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/21/patches/backport-ffmpeg-7-support-jfx21.patch rename to pkgs/by-name/op/openjfx/21/patches/backport-ffmpeg-7-support-jfx21.patch diff --git a/pkgs/development/compilers/openjdk/openjfx/21/source.json b/pkgs/by-name/op/openjfx/21/source.json similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/21/source.json rename to pkgs/by-name/op/openjfx/21/source.json diff --git a/pkgs/development/compilers/openjdk/openjfx/23/deps.json b/pkgs/by-name/op/openjfx/23/deps.json similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/23/deps.json rename to pkgs/by-name/op/openjfx/23/deps.json diff --git a/pkgs/development/compilers/openjdk/openjfx/23/source.json b/pkgs/by-name/op/openjfx/23/source.json similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/23/source.json rename to pkgs/by-name/op/openjfx/23/source.json diff --git a/pkgs/development/compilers/openjdk/openjfx/generic.nix b/pkgs/by-name/op/openjfx/package.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/generic.nix rename to pkgs/by-name/op/openjfx/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 534b09999bd6..c046335cdac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15039,8 +15039,9 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx17 openjfx21 openjfx23; - openjfx = openjfx17; + openjfx17 = openjfx; + openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; }; + openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; }; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index edcd30c45970..bef177372945 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -2,13 +2,8 @@ with pkgs; -let - openjfx17 = callPackage ../development/compilers/openjdk/openjfx/generic.nix { featureVersion = "17"; }; - openjfx21 = callPackage ../development/compilers/openjdk/openjfx/generic.nix { featureVerison = "21"; }; - openjfx23 = callPackage ../development/compilers/openjdk/openjfx/generic.nix { featureVersion = "23"; }; - -in { - inherit openjfx17 openjfx21 openjfx23; +{ + inherit (pkgs) openjfx17 openjfx21 openjfx23; compiler = let mkOpenjdk = featureVersion: path-darwin: