Skip to content

OpenJDK: 13.0.2 -> 14.0.1#83116

Merged
2 commits merged intoNixOS:masterfrom
jerith666:jdk-14
May 7, 2020
Merged

OpenJDK: 13.0.2 -> 14.0.1#83116
2 commits merged intoNixOS:masterfrom
jerith666:jdk-14

Conversation

@jerith666
Copy link
Contributor

@jerith666 jerith666 commented Mar 22, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
  • build on i686
  • test some more

cc @edwtjo @shlevy @NeQuissimus @lopsided98 @xfix @petabyteboy

@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 labels Mar 22, 2020
@ofborg ofborg bot requested review from abbradar and edwtjo March 22, 2020 03:17
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 22, 2020
@lopsided98
Copy link
Contributor

i686 is going to be a problem, because OpenJDK only supports bootstrapping with the previous or same major version, and our bootstrap version is 12. We will probably need to create an OpenJDK 13 bootstrap tarball for i686. There are scripts to do this, although I haven't tested them. The biggest problem I see is ensuring that the resulting tarball is trustworthy.

@jerith666
Copy link
Contributor Author

Yeah, we had that exact same problem in the 12 -> 13 PR (#70983), and I've just extended the same approach I took there: keep the expression for 13 around and use it to bootstrap 14. Perhaps not elegant, but since i686 isn't a primary platform targeted by nixpkgs, it doesn't bother me too much to require a bit of extra building from source in that case.

I'm going to run my eclipse on top of this build for a couple of days at work this week, and if all goes well I'll remove the 'WIP' from the title here and be ready to merge.

@jerith666
Copy link
Contributor Author

Seems to have worked fine so far at work this week. I'm removing the WIP and I think it's ready to merge.

@jerith666 jerith666 changed the title WIP: openjdk: 13.0.2 -> 14 OpenJDK: 13.0.2 -> 14 Mar 27, 2020
@jerith666 jerith666 changed the title OpenJDK: 13.0.2 -> 14 OpenJDK: 13.0.2 -> 14.0.1 Apr 15, 2020
@jerith666
Copy link
Contributor Author

bumped to 14.0.1, which was released today.

@NeQuissimus
Copy link
Member

Other than the rebase that is required, LGTM

@wamserma
Copy link
Member

@jerith666 ping, please rebase the PR to fix the conflict

@jerith666
Copy link
Contributor Author

weird, it rebased cleanly with no conflicts from the command line ...

@piegamesde
Copy link
Member

I just successfully built this on Arch Linux.

@ghost ghost force-pushed the jdk-14 branch from 39c6006 to 6f78b58 Compare May 7, 2020 16:18
@ghost ghost merged commit 54af710 into NixOS:master May 7, 2020
@jerith666 jerith666 mentioned this pull request Dec 24, 2020
10 tasks
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants