From dca850e3a2c8686dab126886ca0b275caf0dea50 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 2 Nov 2022 15:36:52 -0400 Subject: [PATCH] adoptopenjdk 17: remove (again) this was originally replaced with temurin in c74221839b5, which landed in staging in acf46b05697 (#140364) but it was also added in b6cb656c0d8 (in support of openjdk 18 in da40a449e9e), which landed directly on master in 9413ebb2e1d (#165354). those two conflicted when master was merged into staging-next in a5dfac88d5893514bcd204ed7f820a0f42ac177c (#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 --- pkgs/top-level/all-packages.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef2108e841f..6a580ab3e092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;