openjdk18: init at 18+37 #165354

xeals · 2022-03-23T02:01:02Z

Description of changes

OpenJDK 18 has moved into general availability (GA) and is considered by the OpenJDK developers to be stable.

This PR provides both openjdk18 and adoptopenjdk-17 used for bootstrapping in line with other OpenJDK versions, but I'm happy to separate this into two PRs if required (or bootstrap with another JDK).

The ignore-LegalNoticeFilePlugin patch for Linux JDK17 has been renamed to add a JDK18 variant which has a different check (using Optional#ifEmpty() rather than !Optional#ifPresent()).

Things done

willcohen · 2022-03-28T19:01:15Z

Error when running nixpkgs-review pr 165354 on darwin:

$ git -c fetch.prune=false fetch --no-tags --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/165354/head:refs/nixpkgs-review/1
remote: Enumerating objects: 1004, done.
remote: Counting objects: 100% (566/566), done.
remote: Compressing objects: 100% (181/181), done.
remote: Total 304 (delta 218), reused 181 (delta 108), pack-reused 0
Receiving objects: 100% (304/304), 81.97 KiB | 1.91 MiB/s, done.
Resolving deltas: 100% (218/218), completed with 82 local objects.
From https://github.com/NixOS/nixpkgs
   b27a002344d..f7ccecfe39c  master                -> refs/nixpkgs-review/0
 + 3f171a9e885...ae8d50bb213 refs/pull/165354/head -> refs/nixpkgs-review/1  (forced update)
$ git worktree add /Users/wcohen/.cache/nixpkgs-review/pr-165354/nixpkgs f7ccecfe39c4ffb339ef479661e9e1945b7bed15
Preparing worktree (detached HEAD f7ccecfe39c)
Updating files: 100% (30073/30073), done.
HEAD is now at f7ccecfe39c Merge pull request #166061 from SuperSandro2000/sshuttle
$ nix-env --option system x86_64-darwin -f /Users/wcohen/.cache/nixpkgs-review/pr-165354/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit --no-ff ae8d50bb213d092a351a212dd7336fb13eada667
Auto-merging pkgs/top-level/all-packages.nix
Auto-merging pkgs/top-level/java-packages.nix
Automatic merge went well; stopped before committing as requested
$ nix-env --option system x86_64-darwin -f /Users/wcohen/.cache/nixpkgs-review/pr-165354/nixpkgs -qaP --xml --out-path --show-trace --meta
error: attribute 'openj9' missing

       at /Users/wcohen/.cache/nixpkgs-review/pr-165354/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix:10:63:

            9|   jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.openj9; };
           10|   jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jre.openj9; };
             |                                                               ^
           11| }

       … while evaluating the attribute 'name'

       at /Users/wcohen/.cache/nixpkgs-review/pr-165354/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix:13:3:

           12|     result = stdenv.mkDerivation {
           13|   name = if sourcePerArch.packageType == "jdk"
             |   ^
           14|     then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
https://github.com/NixOS/nixpkgs/pull/165354 failed to build
$ git worktree prune

willcohen · 2022-03-28T22:57:21Z

@ofborg eval

xeals · 2022-03-28T23:09:45Z

Looking upstream it seems OpenJ9 builds (which nixpkgs pulls from AdoptOpenJDK) are now provided by Semeru. The missing packages should be all removed now.

willcohen · 2022-03-29T13:07:06Z

$ /nix/store/mygph0cysf2193ygvx9fd7ypydbrgm4k-zulu18.28.13-ca-jdk-18.0.0/bin/java --version
openjdk 18 2022-03-22
OpenJDK Runtime Environment Zulu18.28+13-CA (build 18+37)
OpenJDK 64-Bit Server VM Zulu18.28+13-CA (build 18+37, mixed mode, sharing)

totoroot · 2022-04-05T11:53:38Z

Could this be merged before the NixOS 22.05 feature freeze? #167025

SuperSandro2000 · 2022-04-08T13:11:57Z

pkgs/development/compilers/openjdk/18.nix

+    src = fetchFromGitHub {
+      owner = "openjdk";
+      repo = "jdk${version.feature}u";
+      rev = "jdk-${version.feature}+${version.build}";


Suggested change

rev = "jdk-${version.feature}+${version.build}";

rev = "jdk-${version}";

version here refers to the attrset above, not the usual derivation.version attribute:

let version = { feature = "18"; build = "36"; }; ...

I can rename and/or inline those variables (also used in derivation version, src repo, and a configure flag) but I'm following convention of other openjdk derivations.

michielboekhoff · 2022-05-04T09:01:12Z

I've been test driving this for a few weeks. It's worked great until the recent glibc upgrade to 2.34 because this is still being built with glibc 2.33 (I've confirmed rebasing fixes this).

Can we get this off the ground please? Is there anything else to do to get this into master?

SuperSandro2000 · 2022-05-04T11:48:33Z

pkgs/development/compilers/openjdk/darwin/18.nix

+      jdkVersion = "18.0.0";
+      sha256 = "0ch4jp2d4pjvxbmbswvjwf7w2flajrvjg5f16ggiy80y8l0y15cm";
+    };
+  }."${stdenv.hostPlatform.system}";


Missing or throw unsupported system or eval fails on other platforms.

With all respect, it a. doesn't get called for non-Darwin platforms, and b. is the same way that all OpenJDK derivations have done this. I can change it if required, but it seems unnecessary and out of line.

nixpkgs/pkgs/top-level/java-packages.nix

Lines 51 to 56 in 992d767

mkOpenjdk = path-linux: path-darwin: args:

if stdenv.isLinux

then mkOpenjdkLinuxOnly path-linux args

else let

openjdk = callPackage path-darwin {};

in openjdk // { headless = openjdk; };

https://github.com/NixOS/nixpkgs/blob/a6b757a52bf2370540ffc2c0210e25e79b419a63/pkgs/top-level/java-packages.nix#L187-L193

Thats not great. It should at least eval on any platform otherwise you can't check if your changes on break evaluation for another platform.

Wouldn't you set the system anyway when testing evaluation for another platform, then stdenv.hostPlatform would show that?

Anyway I don't think we put too many expectations on the evaluation of packages if they're not checked on hydra / ofborg, and all the ofborg builds on the PR are green, so I think it's ok.

I don't think we put too many expectations on the evaluation of packages if they're not checked on hydra / ofborg

Especially important to:

Help reviewers be more effective, since they can rely on ofborg builds and focus on other aspects of the PR.

Help contributors get faster signal on their PRs, and have a higher confidence that their code is good if the build is green.

Jonpez2 · 2022-06-24T11:24:11Z

Hello friends! This issue seems to be a bit stalled; is there any way to push this through please?

Thank you!

Jonpez2 · 2022-07-03T06:17:25Z

Please?

fabianhjr

Diff LGTM, built and tested adopt-openjdk17 on NixOS x86_64 for another PR ( #183763 ) by cherry-picking a commit from here over there.

marsam

LGTM

uri-canva · 2022-08-09T23:06:33Z

@SuperSandro2000 are you happy to proceed?

filmon-arefayne · 2022-09-05T09:26:53Z

Do we have an update on this? thanks.

uri-canva · 2022-09-05T12:01:11Z

Will proceed to merge, let me rebase this.

marsam · 2022-09-13T05:36:03Z

@GrahamcOfBorg eval

Jonpez2 · 2022-10-03T09:09:28Z

Now that openjdk19 is out, is there some mechanism to generate an equivalent pull request? Is it just a matter of copy+pasting the 18 files and pointing them at the latest releases + shas from here - https://github.com/adoptium/temurin19-binaries/releases ?
(Sorry if this is the wrong place to ask this!)

Thanks!

jerith666 · 2022-11-02T19:39:24Z

#195638 is the official packaging request for OpenJDK 19.

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

xeals added 2 commits March 23, 2022 12:56

adoptopenjdk: add 17.0.2

b6cb656

openjdk18: init at 18+36

da40a44

xeals force-pushed the openjdk18 branch 2 times, most recently from ee4b82d to f375389 Compare March 28, 2022 22:56

xeals force-pushed the openjdk18 branch from f375389 to 7645d4f Compare March 28, 2022 23:05

xeals force-pushed the openjdk18 branch from 7645d4f to bb56653 Compare March 28, 2022 23:15

ofborg bot added the 8.has: package (new) This PR adds a new package label Mar 28, 2022

ofborg bot requested review from asbachb and edwtjo March 28, 2022 23:28

ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500 labels Mar 28, 2022

xeals force-pushed the openjdk18 branch from bb56653 to a6b757a Compare March 28, 2022 23:42

willcohen approved these changes Mar 29, 2022

View reviewed changes

willcohen requested a review from SuperSandro2000 April 5, 2022 18:27

SuperSandro2000 reviewed Apr 8, 2022

View reviewed changes

xeals changed the title ~~openjdk18: init at 18+36~~ openjdk18: init at 18+37 Apr 10, 2022

SuperSandro2000 requested changes May 4, 2022

View reviewed changes

Artturin added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 9, 2022

fabianhjr mentioned this pull request Aug 4, 2022

jetbrains.jdk: openjdk11 (11.0.13-b1751.25) → openjdk17 (17.0.3-b469.37) #183763

Merged

13 tasks

fabianhjr approved these changes Aug 9, 2022

View reviewed changes

fabianhjr added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people labels Aug 9, 2022

marsam approved these changes Aug 9, 2022

View reviewed changes

bobby285271 removed 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approvals: 2 This PR was reviewed and approved by two reputable people labels Aug 12, 2022

emmanuelrosa mentioned this pull request Aug 13, 2022

sparrow: 1.6.5 -> 1.7.0 #186508

Merged

10 tasks

linsui mentioned this pull request Sep 4, 2022

jabref: 5.6 -> 5.7 #189720

Merged

13 tasks

uri-canva force-pushed the openjdk18 branch from a6b757a to bab599d Compare September 5, 2022 12:07

bobby285271 removed the 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people label Sep 5, 2022

uri-canva force-pushed the openjdk18 branch from bab599d to 5afd177 Compare September 5, 2022 23:49

marsam force-pushed the openjdk18 branch from 5afd177 to da40a44 Compare September 18, 2022 19:06

marsam merged commit 9413ebb into NixOS:master Sep 18, 2022

xeals deleted the openjdk18 branch September 19, 2022 01:46

jerith666 mentioned this pull request Nov 2, 2022

adoptopenjdk 17: remove (again) #199211

Merged

13 tasks

Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

openjdk18: init at 18+37 #165354

openjdk18: init at 18+37 #165354

xeals commented Mar 23, 2022 •

edited

Loading

willcohen commented Mar 28, 2022

willcohen commented Mar 28, 2022

xeals commented Mar 28, 2022

willcohen commented Mar 29, 2022

totoroot commented Apr 5, 2022

SuperSandro2000 Apr 8, 2022

xeals Apr 10, 2022 •

edited

Loading

michielboekhoff commented May 4, 2022

SuperSandro2000 May 4, 2022

xeals May 17, 2022

SuperSandro2000 May 20, 2022

uri-canva Aug 5, 2022

uri-canva Aug 5, 2022

Jonpez2 commented Jun 24, 2022

Jonpez2 commented Jul 3, 2022

fabianhjr left a comment •

edited

Loading

marsam left a comment

uri-canva commented Aug 9, 2022

filmon-arefayne commented Sep 5, 2022

uri-canva commented Sep 5, 2022

marsam commented Sep 13, 2022

Jonpez2 commented Oct 3, 2022

jerith666 commented Nov 2, 2022

	rev = "jdk-${version.feature}+${version.build}";
	rev = "jdk-${version}";

	mkOpenjdk = path-linux: path-darwin: args:
	if stdenv.isLinux
	then mkOpenjdkLinuxOnly path-linux args
	else let
	openjdk = callPackage path-darwin {};
	in openjdk // { headless = openjdk; };

openjdk18: init at 18+37 #165354

openjdk18: init at 18+37 #165354

Conversation

xeals commented Mar 23, 2022 • edited Loading

Description of changes

Things done

willcohen commented Mar 28, 2022

willcohen commented Mar 28, 2022

xeals commented Mar 28, 2022

willcohen commented Mar 29, 2022

totoroot commented Apr 5, 2022

SuperSandro2000 Apr 8, 2022

Choose a reason for hiding this comment

xeals Apr 10, 2022 • edited Loading

Choose a reason for hiding this comment

michielboekhoff commented May 4, 2022

SuperSandro2000 May 4, 2022

Choose a reason for hiding this comment

xeals May 17, 2022

Choose a reason for hiding this comment

SuperSandro2000 May 20, 2022

Choose a reason for hiding this comment

uri-canva Aug 5, 2022

Choose a reason for hiding this comment

uri-canva Aug 5, 2022

Choose a reason for hiding this comment

Jonpez2 commented Jun 24, 2022

Jonpez2 commented Jul 3, 2022

fabianhjr left a comment • edited Loading

Choose a reason for hiding this comment

marsam left a comment

Choose a reason for hiding this comment

uri-canva commented Aug 9, 2022

filmon-arefayne commented Sep 5, 2022

uri-canva commented Sep 5, 2022

marsam commented Sep 13, 2022

Jonpez2 commented Oct 3, 2022

jerith666 commented Nov 2, 2022

xeals commented Mar 23, 2022 •

edited

Loading

xeals Apr 10, 2022 •

edited

Loading

fabianhjr left a comment •

edited

Loading