-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
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
openjdk: 12.0.2 -> 13.0.2 #70983
openjdk: 12.0.2 -> 13.0.2 #70983
Conversation
please rebase on top of master to fix conflicts
|
weird ... my git client resolved that conflict automatically. but I checked manually and it seems right to me (the |
it still needs to be folded into the previous commit to adhere to the contributing guidelines.
|
Done, sorry! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new packages didnt build:
warning: ignoring the user-specified setting 'sandbox', because it is a restricted setting and you are not a trusted user
builder for '/nix/store/iwiw6wc4c07nyjhimf4hp52y6d9dyh26-openjfx-deps-13-14.drv' failed with exit code 1; last 10 log lines:
Execution failed for task ':graphics:ccLinuxGlassGlassgtk2'.
> java.util.concurrent.ExecutionException: org.gradle.process.internal.ExecException: Process 'command 'gcc'' finished with non-zero exit value 1
* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.
* Get more help at https://help.gradle.org
BUILD FAILED in 2m 32s
27 actionable tasks: 27 executed
cannot build derivation '/nix/store/8b9hfbijd37q51858k8b9jci0m9chs1n-openjfx-modular-sdk-13-14.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/yqv9z426r9g37as0ymglqqbdm9d4by3n-openjdk-13+33.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/sc2ch4c1gi8djdlp33y09pwwl2w0ciqh-env.drv': 2 dependencies couldn't be built
[6 built (1 failed), 4 copied (707.8 MiB), 550.1 MiB DL]
error: build of '/nix/store/sc2ch4c1gi8djdlp33y09pwwl2w0ciqh-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/70983
2 package failed to build:
jdk13 openjfx13
2 package were build:
jdk13_headless openjdk13bootjdk
okay, I admit I didn't try rebuilding after I rebased. I'll take a look. |
it's why we have reviews, no worries :) |
Ugh, the errors are all like this:
I think there was a massive GTK update that landed recently, probably that's the cause ... |
cc @worldofpeace for gtk knowledge |
@jerith666 Try adding |
That did the trick -- thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would like to bring the bootstrapping process in line with other JDK versions, but I would also be ok with merging this as is if that is too much work right now.
See #71016 |
rebuilding now to try this out, will post an update here once I see it working -- thanks! |
Okay, bootstrapping with AdoptOpenJDK 13 works; new version pushed. |
Hm ... well, correction ... bootstrapping works on |
adoptium/temurin-build#986 is the issue for AdoptOpenJDK 32-bit x86. |
I mentioned that problem in my comment - we can produce our own bootstrap tarball like we have for other OpenJDK versions. There are scripts to do this but they haven't been used since JDK 10 so they may need some updates. Ideally, the tarball would be reproducible, so that multiple people could help verify that it has not been tampered with. |
Okay, I just pushed a version that bootstraps with adoptopenjdk on 64-bit, but with openjdk 12 on 32-bit. I think that's the best I can do on my own. I haven't tested darwin b/c I don't have a machine that can do that. |
I think that is a good solution for now. I have been thinking of a way to create a somewhat trustworthy bootstrap tarball. I doubt the OpenJDK build itself is reproducible, but we can let Hydra build OpenJDK 13 with the current bootstrapping method. This gives a trusted build of OpenJDK that can hopefully be used to reproducibly create a bootstrap tarball, which would allow others to verify that it has not been tampered with. |
Conflicts: pkgs/development/compilers/adoptopenjdk-bin/sources.json -- keep newer adoptopenjdk versions from HEAD^2
conflicts fixed and bumped to 13.0.2. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mostly LGTM, and everything builds:
7 package built:
openjdk13-bootstrap adoptopenjdk-jre-hotspot-bin-13 adoptopenjdk-jre-openj9-bin-13 adoptopenjdk-openj9-bin-13 jdk13 jdk13_headless openjfx13
What is a status of this? This blocks update to OpenJDK 14, as OpenJDK 13 compiler is needed for that. |
I just noticed that this conflicts with 74d9a1f; testing a fix now. |
okay, jetbrains-jdk conflict fixed; this is once again ready to merge! |
I will run nix-review and unless anyone raises new concerns I would merge it. Meanwhile JDK 14 was released as -ga. |
19 package built: |
Motivation for this change
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @shlevy @NeQuissimus @lopsided98