Skip to content

Commit

Permalink
openjfx11: drop (#347149)
Browse files Browse the repository at this point in the history
  • Loading branch information
thiagokokada authored Oct 7, 2024
2 parents 7cedc7e + c979637 commit 7b588db
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 265 deletions.
2 changes: 2 additions & 0 deletions pkgs/applications/blockchains/bisq-desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ juaningan emmanuelrosa ];
platforms = [ "x86_64-linux" ];
# Requires OpenJFX 11 or 16, which are both EOL.
broken = true;
};
}
103 changes: 0 additions & 103 deletions pkgs/development/compilers/openjdk/openjfx/11/default.nix

This file was deleted.

152 changes: 0 additions & 152 deletions pkgs/development/compilers/openjdk/openjfx/11/deps.json

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,7 @@ mapAliases {
openjdk20_headless = openjdk20; # Added 2024-08-01
jdk20 = openjdk20; # Added 2024-08-01
jdk20_headless = openjdk20; # Added 2024-08-01
openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07
openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
openjpeg_2 = openjpeg; # Added 2021-01-25
Expand Down
10 changes: 3 additions & 7 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3299,9 +3299,7 @@ with pkgs;

bazarr = callPackage ../servers/bazarr { };

bisq-desktop = callPackage ../applications/blockchains/bisq-desktop {
openjdk11 = openjdk11.override { enableJavaFX = true; };
};
bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { };

bic = callPackage ../development/interpreters/bic { };

Expand Down Expand Up @@ -12374,9 +12372,7 @@ with pkgs;
snort = callPackage ../applications/networking/ids/snort { };

soapui = callPackage ../applications/networking/soapui {
jdk = if stdenv.hostPlatform.isDarwin
then (jdk11.override { enableJavaFX = true; })
else jdk11;
jdk = jdk11;
};

sockdump = callPackage ../tools/networking/sockdump { };
Expand Down Expand Up @@ -15102,7 +15098,7 @@ with pkgs;

hugs = callPackage ../development/interpreters/hugs { };

inherit (javaPackages) openjfx11 openjfx17 openjfx21 openjfx22;
inherit (javaPackages) openjfx17 openjfx21 openjfx22;
openjfx = openjfx17;

openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
Expand Down
5 changes: 2 additions & 3 deletions pkgs/top-level/java-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
with pkgs;

let
openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11 { };
openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17 { };
openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21 { };
openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22 { };

in {
inherit openjfx11 openjfx17 openjfx21 openjfx22;
inherit openjfx17 openjfx21 openjfx22;

compiler = let
mkOpenjdk = path-linux: path-darwin: args:
Expand Down Expand Up @@ -44,7 +43,7 @@ in {
openjdk11 = mkOpenjdk
../development/compilers/openjdk/11.nix
../development/compilers/zulu/11.nix
{ openjfx = openjfx11; };
{ openjfx = throw "JavaFX is not supported on OpenJDK 11"; };

openjdk17 = mkOpenjdk
../development/compilers/openjdk/17.nix
Expand Down

0 comments on commit 7b588db

Please sign in to comment.