openjdk: 12.0.2 -> 13.0.2 #70983

jerith666 · 2019-10-11T17:32:59Z

Motivation for this change

Things done

Notify maintainers

jonringer · 2019-10-11T17:35:58Z

please rebase on top of master to fix conflicts

git pull -r origin master

jerith666 · 2019-10-11T17:37:38Z

weird ... my git client resolved that conflict automatically. but I checked manually and it seems right to me (the NIX_CFLAGS_COMPILE setting from 203ba05 is preserved in openjfx/13.nx).

jonringer · 2019-10-11T17:50:47Z

it still needs to be folded into the previous commit to adhere to the contributing guidelines.

git reset HEAD^
git commit -a --amend --no-edit
git push <remote> jdk-13 --force

jerith666 · 2019-10-11T17:55:20Z

Done, sorry!

jonringer

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

jerith666 · 2019-10-11T19:56:56Z

okay, I admit I didn't try rebuilding after I rebased. I'll take a look.

jonringer · 2019-10-11T20:00:03Z

it's why we have reviews, no worries :)

jerith666 · 2019-10-11T20:26:11Z

Ugh, the errors are all like this:

> Task :graphics:linkLinuxGlassGlass
In file included from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtkobject.h:37,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtkwidget.h:36,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtkcontainer.h:35,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtkbin.h:35,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtkwindow.h:36,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtkdialog.h:35,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtkaboutdialog.h:32,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtk.h:33,
                 from /build/rt-13+14/modules/javafx.graphics/src/main/native-glass/gtk/wrapped.c:36:
/nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtktypeutils.h:236:1: error: 'GTypeDebugFlags' is deprecated [-Werror=deprecated-declarations]
 void            gtk_type_init   (GTypeDebugFlags    debug_flags);
 ^~~~
In file included from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gobject/gobject.h:24,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gobject/gbinding.h:29,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/glib-object.h:23,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gio/gioenums.h:28,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gio/giotypes.h:28,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gio/gio.h:26,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gdk/gdk.h:32,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtk.h:32,
                 from /build/rt-13+14/modules/javafx.graphics/src/main/native-glass/gtk/wrapped.c:36:
/nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gobject/gtype.h:679:1: note: declared here
 {
 ^
In file included from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtktoolitem.h:31,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtktoolbutton.h:30,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtkmenutoolbutton.h:30,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtk.h:126,
                 from /build/rt-13+14/modules/javafx.graphics/src/main/native-glass/gtk/wrapped.c:36:
/nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtktooltips.h:73:3: error: 'GTimeVal' is deprecated: Use 'GDateTime' instead [-Werror=deprecated-declarations]
   GTimeVal last_popdown;
   ^~~~~~~~
In file included from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/glib/galloca.h:32,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/glib.h:30,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gobject/gbinding.h:28,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/glib-object.h:23,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gio/gioenums.h:28,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gio/giotypes.h:28,
                 from /nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/gio/gio.h:26,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gdk/gdk.h:32,
                 from /nix/store/375635822k7wgr9l49b4rrdwdh6b3h5f-gtk+-2.24.32-dev/include/gtk-2.0/gtk/gtk.h:32,
                 from /build/rt-13+14/modules/javafx.graphics/src/main/native-glass/gtk/wrapped.c:36:
/nix/store/sqvbi2ypbnldgxl7fsx0jzcsvl8y0047-glib-2.62.0-dev/include/glib-2.0/glib/gtypes.h:551:8: note: declared here
 struct _GTimeVal
        ^~~~~~~~~
cc1: all warnings being treated as errors

I think there was a massive GTK update that landed recently, probably that's the cause ...

jonringer · 2019-10-11T20:59:43Z

cc @worldofpeace for gtk knowledge

jerith666 · 2019-10-11T21:06:23Z

The big GTK thing landing I was thinking of was actually Gnome 3.34 (#68608), but still may be related. That was between the earlier version of this PR that did build and this one. The old version was based on d484f2b so the cause of this breakage must be between there and b943338.

worldofpeace · 2019-10-11T22:20:57Z

@jerith666 Try adding NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];.
They moved a lot of things into deprecation and usually these warnings get treated as compile errors.
And yes that glib updated happened in #68608 so it's directly related.

jerith666 · 2019-10-12T02:30:16Z

That did the trick -- thanks!

lopsided98

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.

pkgs/top-level/all-packages.nix

lopsided98 · 2019-10-12T03:33:41Z

See #71016

jerith666 · 2019-10-13T14:11:25Z

rebuilding now to try this out, will post an update here once I see it working -- thanks!

jerith666 · 2019-10-14T02:36:49Z

Okay, bootstrapping with AdoptOpenJDK 13 works; new version pushed.

jerith666 · 2019-10-14T11:26:55Z

Hm ... well, correction ... bootstrapping works on x86_64-linux, but not on i686-linux. I'd rather not have to drop 32-bit just to achieve a "cleaner" bootstrapping process ... :-/

jerith666 · 2019-10-14T11:40:22Z

adoptium/temurin-build#986 is the issue for AdoptOpenJDK 32-bit x86.

lopsided98 · 2019-10-14T15:35:42Z

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.

jerith666 · 2019-10-17T15:49:50Z

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.

lopsided98 · 2019-10-17T16:14:07Z

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

jerith666 · 2020-03-09T19:28:12Z

conflicts fixed and bumped to 13.0.2.

jonringer

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

pkgs/development/compilers/openjdk/default.nix

KamilaBorowska · 2020-03-18T05:36:11Z

What is a status of this? This blocks update to OpenJDK 14, as OpenJDK 13 compiler is needed for that.

jerith666 · 2020-03-19T01:03:53Z

I just noticed that this conflicts with 74d9a1f; testing a fix now.

…n openjdk12

jerith666 · 2020-03-20T12:23:43Z

okay, jetbrains-jdk conflict fixed; this is once again ready to merge!

ghost · 2020-03-20T12:35:36Z

I will run nix-review and unless anyone raises new concerns I would merge it. Meanwhile JDK 14 was released as -ga.

ghost · 2020-03-20T15:57:05Z

19 package built:
openjdk13-bootstrap adoptopenjdk-jre-hotspot-bin-13 adoptopenjdk-jre-openj9-bin-13 adoptopenjdk-openj9-bin-13 jdk13 jdk13_headless jetbrains.clion jetbrains.datagrip jetbrains.goland jetbrains.idea-community jetbrains.idea-ultimate jetbrains.jdk jetbrains.phpstorm jetbrains.pycharm-community jetbrains.pycharm-professional jetbrains.rider jetbrains.ruby-mine jetbrains.webstorm openjfx13

ofborg bot added 8.has: documentation 8.has: clean-up 8.has: package (new) labels Oct 11, 2019

ofborg bot requested review from abbradar and edwtjo October 11, 2019 17:48

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Oct 11, 2019

jerith666 force-pushed the jdk-13 branch from eb9e50d to d02a321 Compare October 11, 2019 17:54

jonringer reviewed Oct 11, 2019

View reviewed changes

jerith666 changed the title ~~openjdk: 12.0.2 -> 13~~ WIP: openjdk: 12.0.2 -> 13 Oct 11, 2019

jerith666 force-pushed the jdk-13 branch from d02a321 to 743063c Compare October 12, 2019 02:29

lopsided98 suggested changes Oct 12, 2019

View reviewed changes

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved

adoptopenjdk-bin: add OpenJDK 13

34b4bab

lopsided98 mentioned this pull request Oct 12, 2019

adoptopenjdk-bin: add OpenJDK 13 #71016

Closed

10 tasks

adoptopenjdk-bin: fix JDK 8 build on ARM

d9d5b73

jerith666 force-pushed the jdk-13 branch from 743063c to 57e6fb1 Compare October 14, 2019 02:35

ofborg bot requested a review from taku0 October 14, 2019 02:50

openjdk: 12.0.2 -> 13.0.1

d00559e

jerith666 force-pushed the jdk-13 branch from 57e6fb1 to d00559e Compare October 17, 2019 15:48

jerith666 changed the title ~~WIP: openjdk: 12.0.2 -> 13~~ openjdk: 12.0.2 -> 13.0.1 Oct 17, 2019

jerith666 added 2 commits March 9, 2020 12:29

Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13

1b87194

Conflicts: pkgs/development/compilers/adoptopenjdk-bin/sources.json -- keep newer adoptopenjdk versions from HEAD^2

openjdk: 13.0.1 -> 13.0.2

36ae82f

jerith666 changed the title ~~openjdk: 12.0.2 -> 13.0.1~~ openjdk: 12.0.2 -> 13.0.2 Mar 9, 2020

jonringer reviewed Mar 10, 2020

View reviewed changes

pkgs/development/compilers/openjdk/default.nix Show resolved Hide resolved

pkgs/development/compilers/openjdk/default.nix Show resolved Hide resolved

KamilaBorowska approved these changes Mar 18, 2020

View reviewed changes

jerith666 added 2 commits March 20, 2020 08:21

Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13

6ebf2d6

jetbrains-jdk: derive expression for 11.0.6 from openjdk11 rather tha…

254e3ea

…n openjdk12

ofborg bot requested a review from a user March 20, 2020 12:32

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 and removed 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Mar 20, 2020

ghost merged commit d1303f1 into NixOS:master Mar 20, 2020

jerith666 mentioned this pull request Mar 22, 2020

OpenJDK: 13.0.2 -> 14.0.1 #83116

Merged

12 tasks

cust0dian-old mentioned this pull request Apr 10, 2020

Upgrade OpenJDK to 13 #73335

Closed

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

openjdk: 12.0.2 -> 13.0.2 #70983

openjdk: 12.0.2 -> 13.0.2 #70983

jerith666 commented Oct 11, 2019

jonringer commented Oct 11, 2019

jerith666 commented Oct 11, 2019 •

edited

Loading

jonringer commented Oct 11, 2019 •

edited

Loading

jerith666 commented Oct 11, 2019

jonringer left a comment

jerith666 commented Oct 11, 2019

jonringer commented Oct 11, 2019

jerith666 commented Oct 11, 2019

jonringer commented Oct 11, 2019

jerith666 commented Oct 11, 2019

worldofpeace commented Oct 11, 2019 •

edited

Loading

jerith666 commented Oct 12, 2019

lopsided98 left a comment

lopsided98 commented Oct 12, 2019

jerith666 commented Oct 13, 2019

jerith666 commented Oct 14, 2019

jerith666 commented Oct 14, 2019

jerith666 commented Oct 14, 2019

lopsided98 commented Oct 14, 2019

jerith666 commented Oct 17, 2019

lopsided98 commented Oct 17, 2019

jerith666 commented Mar 9, 2020

jonringer left a comment

KamilaBorowska commented Mar 18, 2020

jerith666 commented Mar 19, 2020

jerith666 commented Mar 20, 2020

ghost commented Mar 20, 2020

ghost commented Mar 20, 2020

openjdk: 12.0.2 -> 13.0.2 #70983

openjdk: 12.0.2 -> 13.0.2 #70983

Conversation

jerith666 commented Oct 11, 2019

Motivation for this change

Things done

Notify maintainers

jonringer commented Oct 11, 2019

jerith666 commented Oct 11, 2019 • edited Loading

jonringer commented Oct 11, 2019 • edited Loading

jerith666 commented Oct 11, 2019

jonringer left a comment

Choose a reason for hiding this comment

jerith666 commented Oct 11, 2019

jonringer commented Oct 11, 2019

jerith666 commented Oct 11, 2019

jonringer commented Oct 11, 2019

jerith666 commented Oct 11, 2019

worldofpeace commented Oct 11, 2019 • edited Loading

jerith666 commented Oct 12, 2019

lopsided98 left a comment

Choose a reason for hiding this comment

lopsided98 commented Oct 12, 2019

jerith666 commented Oct 13, 2019

jerith666 commented Oct 14, 2019

jerith666 commented Oct 14, 2019

jerith666 commented Oct 14, 2019

lopsided98 commented Oct 14, 2019

jerith666 commented Oct 17, 2019

lopsided98 commented Oct 17, 2019

jerith666 commented Mar 9, 2020

jonringer left a comment

Choose a reason for hiding this comment

KamilaBorowska commented Mar 18, 2020

jerith666 commented Mar 19, 2020

jerith666 commented Mar 20, 2020

ghost commented Mar 20, 2020

ghost commented Mar 20, 2020

jerith666 commented Oct 11, 2019 •

edited

Loading

jonringer commented Oct 11, 2019 •

edited

Loading

worldofpeace commented Oct 11, 2019 •

edited

Loading