mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
openjfx23: drop
This commit is contained in:
parent
3af1b1461b
commit
cfafc746ea
|
|
@ -129,7 +129,7 @@ The update script does the following:
|
||||||
`fetchDeps` takes the following arguments:
|
`fetchDeps` takes the following arguments:
|
||||||
|
|
||||||
- `attrPath` - the path to the package in nixpkgs (for example,
|
- `attrPath` - the path to the package in nixpkgs (for example,
|
||||||
`"javaPackages.openjfx22"`). Used for update script metadata.
|
`"javaPackages.openjfx25"`). Used for update script metadata.
|
||||||
- `pname` - an alias for `attrPath` for convenience. This is what you
|
- `pname` - an alias for `attrPath` for convenience. This is what you
|
||||||
will generally use instead of `pkg` or `attrPath`.
|
will generally use instead of `pkg` or `attrPath`.
|
||||||
- `pkg` - the package to be used for fetching the dependencies. Defaults
|
- `pkg` - the package to be used for fetching the dependencies. Defaults
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ Each supported language or software ecosystem has its own package set named `<la
|
||||||
$ nix repl '<nixpkgs>' -I nixpkgs=channel:nixpkgs-unstable
|
$ nix repl '<nixpkgs>' -I nixpkgs=channel:nixpkgs-unstable
|
||||||
nix-repl> javaPackages.<tab>
|
nix-repl> javaPackages.<tab>
|
||||||
javaPackages.compiler javaPackages.openjfx15 javaPackages.openjfx21 javaPackages.recurseForDerivations
|
javaPackages.compiler javaPackages.openjfx15 javaPackages.openjfx21 javaPackages.recurseForDerivations
|
||||||
javaPackages.jogl_2_4_0 javaPackages.openjfx17 javaPackages.openjfx22
|
javaPackages.jogl_2_4_0 javaPackages.openjfx17 javaPackages.openjfx25
|
||||||
javaPackages.mavenfod javaPackages.openjfx19 javaPackages.override
|
javaPackages.mavenfod javaPackages.openjfx19 javaPackages.override
|
||||||
javaPackages.openjfx11 javaPackages.openjfx20 javaPackages.overrideDerivation
|
javaPackages.openjfx11 javaPackages.openjfx20 javaPackages.overrideDerivation
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -58,13 +58,11 @@
|
||||||
enableJavaFX ? false,
|
enableJavaFX ? false,
|
||||||
openjfx17,
|
openjfx17,
|
||||||
openjfx21,
|
openjfx21,
|
||||||
openjfx23,
|
|
||||||
openjfx25,
|
openjfx25,
|
||||||
openjfx_jdk ?
|
openjfx_jdk ?
|
||||||
{
|
{
|
||||||
"17" = openjfx17;
|
"17" = openjfx17;
|
||||||
"21" = openjfx21;
|
"21" = openjfx21;
|
||||||
"23" = openjfx23;
|
|
||||||
"25" = openjfx25;
|
"25" = openjfx25;
|
||||||
}
|
}
|
||||||
.${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
|
.${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
|
||||||
|
|
|
||||||
|
|
@ -1149,6 +1149,7 @@ mapAliases {
|
||||||
openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
|
openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
|
||||||
openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
|
openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
|
||||||
openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
|
openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
|
||||||
|
openjfx23 = throw "OpenJFX 23 was removed as it has reached its end of life"; # Added 2025-11-04
|
||||||
openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
|
openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
|
||||||
openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
|
openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
|
||||||
openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27
|
openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27
|
||||||
|
|
|
||||||
|
|
@ -4988,7 +4988,6 @@ with pkgs;
|
||||||
|
|
||||||
openjfx17 = openjfx;
|
openjfx17 = openjfx;
|
||||||
openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
|
openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
|
||||||
openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };
|
|
||||||
openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; };
|
openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; };
|
||||||
|
|
||||||
openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
|
openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ let
|
||||||
;
|
;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit (pkgs) openjfx17 openjfx21 openjfx23;
|
inherit (pkgs) openjfx17 openjfx21 openjfx25;
|
||||||
compiler = lib.recurseIntoAttrs (
|
compiler = lib.recurseIntoAttrs (
|
||||||
let
|
let
|
||||||
# merge meta.platforms of both packages so that dependent packages and hydra build them
|
# merge meta.platforms of both packages so that dependent packages and hydra build them
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue