Skip to content

temurin-bin: init, semeru-bin: init, adoptopenjdk-bin: remove 13, 14, 17#140364

Merged
fpletz merged 2 commits intoNixOS:stagingfrom
taku0:temurin-17
Sep 12, 2022
Merged

temurin-bin: init, semeru-bin: init, adoptopenjdk-bin: remove 13, 14, 17#140364
fpletz merged 2 commits intoNixOS:stagingfrom
taku0:temurin-17

Conversation

@taku0
Copy link
Copy Markdown
Contributor

@taku0 taku0 commented Oct 3, 2021 •
edited
Loading

Motivation for this change

AdoptOpenJDK Hotspot is now Eclipse Temurin and AdoptOpenJDK OpenJ9 is IBM Semeru Runtime.

This PR adds temurin-bin and semeru-bin, and removes adoptopenjdk-bin package.

Temurin/Semeru 13, 14, and 15 is no longer supported and removed.

Supersedes #140116.

cc: @timothyklim, @edwtjo, @asbachb, @fpletz

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Tested with a simple AWT and Swing sample app.

SuperSandro2000
SuperSandro2000 reviewed Oct 3, 2021
View reviewed changes
pkgs/development/compilers/semeru-bin/jdk11-darwin.nix Outdated
Copy link
Copy Markdown
Member

@SuperSandro2000 SuperSandro2000 Oct 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use lib.importJSON

SuperSandro2000
SuperSandro2000 reviewed Oct 3, 2021
View reviewed changes
SuperSandro2000
SuperSandro2000 reviewed Oct 3, 2021
View reviewed changes
SuperSandro2000
SuperSandro2000 reviewed Oct 3, 2021
View reviewed changes
@SuperSandro2000 SuperSandro2000 marked this pull request as draft October 3, 2021 12:19
@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Oct 3, 2021

Please check with nix-env -qaP locally if everything evals.

@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Oct 4, 2021

@SuperSandro2000
Addressed the review comments.

Temurin don't have version 15 while openjdk16 requires it for bootstrapping. So, I'm keeping AdoptOpenJDK until openjdk16 is removed.

@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Oct 4, 2021
SuperSandro2000
SuperSandro2000 reviewed Oct 4, 2021
View reviewed changes
@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Oct 10, 2021

@SuperSandro2000
Addressed the review comments.

@taku0 taku0 marked this pull request as ready for review October 17, 2021 13:10
@FreeMonoid
Copy link
Copy Markdown

FreeMonoid commented Dec 12, 2021

Anything that can be done here by an outsider to help move things along?

@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Dec 15, 2021

I will update it this weekends (or next weekends).

@SuperSandro2000 SuperSandro2000 added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 16, 2021
@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Dec 18, 2021

Resolved conflicts. Updated versions and tested again.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 18, 2021
@Moredread
Copy link
Copy Markdown
Contributor

Moredread commented Dec 26, 2021 •
edited
Loading

~~Mediathekview needs Java 17 for the latest version that also contains a security fix (upgrading log4j).

Is there a plan to backport this PR to 21.11?~~

Have found another mitigation for the Backports

This was referenced Dec 26, 2021
Closed
Closed
pmenke-de
pmenke-de reviewed Dec 30, 2021
View reviewed changes
@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Dec 31, 2021

Now using pname and version rather than name.

@Lassulus
Copy link
Copy Markdown
Member

Lassulus commented Apr 5, 2022

needs a rebase

@SuperSandro2000 SuperSandro2000 added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 8, 2022
@mschuwalow
Copy link
Copy Markdown
Contributor

mschuwalow commented Jun 30, 2022

@taku0 are you still working on this?

@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Jul 1, 2022

I will update this on the weekend. Maybe it is better to focus on temurin and semeru.

@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Jul 2, 2022

Updated.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 2, 2022
mschuwalow
mschuwalow reviewed Jul 14, 2022
View reviewed changes
@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Jul 15, 2022

Could we easily change this to have less boilerplate code?

mschuwalow
mschuwalow reviewed Jul 16, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@mschuwalow mschuwalow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for my last comment, seems like the jre one is still missing for openjdk16. All others should be fine though

@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Jul 18, 2022

Addressed the comments.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jul 18, 2022
@NickCao
Copy link
Copy Markdown
Member

NickCao commented Aug 7, 2022

ping @SuperSandro2000 in case you forgot this one 😉

@taku0
temurin-bin, semeru-bin: init at 17.0.3, adoptopenjdk-bin: remove 13,…
c742218 
… 14, 17

AdoptOpenJDK Hotspot is now Eclipse Temurin and AdoptOpenJDK OpenJ9 is
now IBM Semeru Runtime.

Adds `temurin-bin` and `semeru-bin` packages.

AdoptOpenJDK 13, 14, and 15 is no longer supported.  AdoptOpenJDK 13 and
14 are removed.  AdoptOpenJDK 15 is left only for some packages
depending it.
@taku0
Copy link
Copy Markdown
Contributor Author

taku0 commented Sep 12, 2022

Updated to the latest version.

@fpletz
Copy link
Copy Markdown
Member

fpletz commented Sep 12, 2022

Sorry I've not looked at this PR sooner. I've recently dropped maintainership for AdoptOpenJDK in nixpkgs but I've looked at the changes now and they look good to me. Since there are evidently users of this, let's merge this now. Thanks!

@fpletz fpletz merged commit acf46b0 into NixOS:staging Sep 12, 2022
jerith666 added a commit to jerith666/nixpkgs that referenced this pull request Nov 2, 2022
@jerith666
adoptopenjdk 17: remove (again)
dca850e 
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
@jerith666 jerith666 mentioned this pull request Nov 2, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@fpletz fpletz fpletz approved these changes

+2 more reviewers

@pmenke-de pmenke-de pmenke-de left review comments

@mschuwalow mschuwalow mschuwalow left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.