openjfx{17,21,23}: move to pkgs/by-name

This commit is contained in:
Emily
2024-10-24 15:04:56 +01:00
parent f05216c373
commit f2569008ab
12 changed files with 5 additions and 9 deletions
+3 -2
View File
@@ -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;
+2 -7
View File
@@ -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: