Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

corretto{11,17,21}: {11.0.25.9.1,17.0.13.11.1,21.0.5.11.1} -> {11.0.2… #392159

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

rollf
Copy link
Contributor

@rollf rollf commented Mar 22, 2025

…6.4.1,17.0.14.7.1,21.0.6.7.1}

I explored whether it's possible to decouple the corretto build from the jdk build (currently, jdk.overrideAtrs is used). I looked into the code for the jdk compilation in more detail and figured it would be way to much work (and probably a lot of copy-and-paste) to do that.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: java Including JDK, tooling, other languages, other VMs 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Mar 22, 2025
# The version scheme is different between OpenJDK & Corretto.
# See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40
# "major.minor.security.build.revision"
let
majorVersion = builtins.head (lib.strings.splitString "." version); # same as "featureVersion" for OpenJDK
pname = "corretto${majorVersion}";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

now:

corretto21> Running phase: unpackPhase
corretto21> unpacking source archive /nix/store/k4k56v1h98ia4hh0bhma2imsqs1pkr8f-source
corretto21> source root is source

before:

corretto> Running phase: unpackPhase
corretto> unpacking source archive /nix/store/k4k56v1h98ia4hh0bhma2imsqs1pkr8f-source
corretto> source root is source

@rollf rollf requested a review from emilazy March 24, 2025 04:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: java Including JDK, tooling, other languages, other VMs 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant