adoptopenjdk 17: remove (again) #199211
Merged
adoptopenjdk 17: remove (again) #199211
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
this was originally replaced with temurin in c742218, which landed in staging in acf46b0 (NixOS#140364) but it was also added in b6cb656 (in support of openjdk 18 in da40a44), which landed directly on master in 9413ebb (NixOS#165354). those two conflicted when master was merged into staging-next in a5dfac8 (NixOS#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
ofborg
bot
added
10.rebuild-darwin: 0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this was originally replaced with temurin in c742218, which landed in staging in acf46b0 (#140364)
but it was also added in b6cb656 (in support of openjdk 18 in da40a44), which landed directly on master in 9413ebb (#165354).
those two conflicted when master was merged into staging-next in a5dfac8 (#191339), and adoptopenjdk 17 was mistakenly kept during the conflict resolution.
the net result is that one would get:
... instead of the desired:
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notescc authors of the above-referenced commits: @taku0 @fpletz @xeals @marsam @vcunat