BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adoptopenjdk 17: remove (again)

Browse source 
this was originally replaced with temurin in c74221839b, which landed
in staging in acf46b0569 (#140364)

but it was also added in b6cb656c0d (in support of openjdk 18 in
da40a449e9), which landed directly on master in 9413ebb2e1
(#165354).

those two conflicted when master was merged into staging-next in
a5dfac88d5 (#191339), and adoptopenjdk
17 was mistakenly kept during the conflict resolution.

the net result is that one would get:

$ nix-build -A pkgs.adoptopenjdk-hotspot-bin-17
error: Alias adoptopenjdk-hotspot-bin-17 is still in all-packages.nix

... instead of the desired:

$ nix-build -A pkgs.adoptopenjdk-hotspot-bin-17
error: AdoptOpenJDK is now Temurin. Use temurin-bin-17
This commit is contained in:
Matt McHenry 2022-11-02 15:36:52 -04:00
parent d40fea9aeb
commit dca850e3a2
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/top-level/all-packages.nix
View file

@ -13344,13 +13344,6 @@ with pkgs;
adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; };
adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-17-packages-linux.jdk-hotspot {}
else callPackage adoptopenjdk-bin-17-packages-darwin.jdk-hotspot {};
adoptopenjdk-jre-hotspot-bin-17 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-17-packages-linux.jre-hotspot {}
else callPackage adoptopenjdk-bin-17-packages-darwin.jre-hotspot {};
adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot;
adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot;
adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9;