3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

238 commits

Author SHA1 Message Date
Uri Baghin 410a51747c openjdk10: add darwin support 2018-08-24 16:35:59 +10:00
John Ericson cfa4e0ac14
openjdk: Fix a cross problem
38eea804e6 dropped the C and C++ compiler prefixes. Probably more work is needed to make cross work, but this at least helps preserve/establish the pattern.
2018-08-20 10:16:17 +02:00
Vladimír Čunát 38eea804e6
openjdk: fixup build after #44767 2018-08-19 20:10:07 +02:00
Tim Steinbach 01183f3c89
openjdk: 8u172-b11 -> 8u181-b13 2018-07-29 20:33:57 +00:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer 19fc061a13
Merge pull request #43169 from samueldr/fix/stripDirs
Fixes `stripDirs` use after signature change
2018-07-14 19:07:46 -04:00
Samuel Dionne-Riel f8790e0156 openjdk-*: Fixes use of stripDirs. 2018-07-07 22:25:38 -04:00
Jamey Sharp f1c3a610b2 openjdk: fix build for !enableGnome2
This OpenJDK packaging has a headless build configuration controlled by
the `minimal` flag, which is regularly build-tested by Hydra, and a
non-headless configuration based on pure Xlib libraries without Gnome
features, which is not normally tested.

Sometime before OpenJDK 8, the !enableGnome2 case broke, because it
needs to link against libXrandr but that wasn't included in the
buildInputs.

If this patch is backported to NixOS 18.03 or earlier, the same fix
needs to be applied to OpenJDK 9.

I have tested OpenJDK versions 8, 9, and 10, but not any other versions.
2018-06-18 15:25:41 -07:00
Philip Lewis 129ea5ed81 openjdk: fix truststore-from-env patch for jdk10
storePropName will be jsseDefaultStore if the property isn't present, and
jsseDefaultStore is never null, so the branch to use the environment variable
would never be taken.

The env var is supposed to be preferred to jssecacerts, so we can use it as
the default in the call to System.getProperty, and use the null check to fall
back on jsseDefaultStore instead.
2018-06-09 20:20:47 -04:00
Matthew Bauer 6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Matthew Justin Bauer b5e558b573
openjdk: move license (again) 2018-05-04 15:11:45 -05:00
Matthew Justin Bauer cf84d6c275
openjdk: move license 2018-05-04 15:11:09 -05:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Tim Steinbach 1b1be29bf8
openjdk: 8u172-b02 -> 8u172-b11 2018-04-28 20:09:17 -04:00
Tim Steinbach 5c8c4710ba
openjdk: 10.0.0 -> 10.0.1 2018-04-28 20:20:47 +00:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Matthew Bauer 1592e03aba treewide: rename bad filenames
Most of these can easily be moved to subdirectories of other
directories. This helps reduce clutter in the main trees.
2018-04-17 15:42:25 -05:00
Tim Steinbach 59ddb3ebfb
Merge pull request #38397 from jerith666/eclipse-jdk10-gtk3
Update OpenJDK 10 and Eclipse to GTK 3
2018-04-05 08:05:55 -04:00
Tim Steinbach 5a53b98248
openjdk10: Use included cacerts 2018-04-03 19:17:35 -04:00
Matt McHenry 2bd7c3a906 openjdk10: gtk2 -> gtk3
http://openjdk.java.net/jeps/283 "Enable GTK 3 on Linux" was included
in OpenJDK 9.

nothing else currently in nixpkgs is using 10, so this just lets us
establish a good baseline as things are ported onto it.  if needed,
the build could be parameterized so that any packages that turn out to
need gtk2 could still use it.
2018-04-03 12:29:39 -04:00
Austin Seipp bffc8c0481 openjdk: move bootstrap tarballs to tarballs.nixos.org
Many thanks to @shlevy for doing this migration of the old and new tarballs.

Closes #38097.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:19:21 -05:00
Austin Seipp 14e0251362 openjdk8: rename swing patch to be more consistent with the others
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Austin Seipp 9357a9fbd5 openjdk: remove some old patches that aren't needed anymore
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Austin Seipp 5d5ed30150 nixpkgs: remove all Java 7 expressions
JDK 7 was technically EOL'd a while ago, although RedHat etc are still
doing updates I believe. However, JDK 8 is the default in the tree and
really used everywhere, and JDK 7 isn't seeing many updates by current maintainers, so dropping it seems appropriate.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Austin Seipp f71b066d60 nixpkgs: remove all Java 9 expressions
Java 9 is EOL, and we no longer need it with JDK 10 builds bootstrapped via JDK
10.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Austin Seipp 0d04d01021 openjdk10: add new bootstrap minimal binary packages
JDK 10 can only be bootstrapped by version 9 or 10, but we want to
now get rid of version 9.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Austin Seipp da9fba1a54 openjdk10: do not remove libawt in the minimal config variant
This is now required to build JDK 10 with JDK 10, so we're a bit
stuck on this one.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Austin Seipp bdb531f6af openjdk/bootstrap: add zlib to bootstrap JDK RPATH
./bin/java now apparently requires zlib.so, otherwise the whole
thing is busted. This is even required in the minimal configuration.

Unfortunately this impiles a rebuild of *all* OpenJDK packages and
their downstream dependencies.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Matt McHenry aabf45c163 openjdk10: minor cleanups
* with only one source bundle (per JEP-296), we can use src instead of
  srcs, and avoid the need to cd in prePatch

* fetch sources from jdk10u instead of jdk10, to make it easier to
  grab updates when they start coming.

* removed commented-out code that became irrelevant in the 8 -> 9
  transition (*.pf files, infinality font rendering)

* create jdk10, jre10, and jre10_headless attributes in
  all-packages.nix
2018-03-25 20:23:12 -04:00
Tim Steinbach f00db926c6
openjdk: Add JDK 10 2018-03-25 00:49:26 -04:00
Austin Seipp 50d41bb624 openjdk9: 9.0.4+11 -> 9.0.4+12
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-03-23 21:18:42 -05:00
Shea Levy 47116c2d5c
openjdk bootstrap: Fix rpath fixup 2018-03-07 06:23:02 -05:00
John Ericson 933e8663ad openjdk: Clean up platform conditionals 2018-02-26 21:17:32 -05:00
Vladimír Čunát 0a941e0b66
treewide: avoid fatal warnings from gcc7 2018-02-10 12:06:02 +01:00
Tim Steinbach e1db0afd61
openjdk: 8u152 -> 8u172 2018-01-18 11:22:44 -05:00
Shea Levy d4dbe03be5
Revert "openjdk: 8u152 -> 8u162"
This bump causes the bazel build to fail with:

> Cannot find requested resource bundle for locale en_US

This reverts commit 241e509abd.
2018-01-18 10:07:04 -05:00
Tim Steinbach 241e509abd
openjdk: 8u152 -> 8u162 2018-01-17 10:11:11 -05:00
Tim Steinbach 416ef9bd8e
openjdk: 9.0.1 -> 9.0.4 2018-01-17 10:11:11 -05:00
Tim Steinbach 21c61d514d
openjdk: 9.0.0 -> 9.0.1 2017-12-23 10:02:38 -05:00
John Ericson da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Tim Steinbach 1c71b0ef31
openjdk: 8u144 -> 8u152 2017-10-19 08:39:01 -04:00
Tim Steinbach 24bed29809
openjdk: Fix build 2017-09-22 11:16:14 -04:00
Matt McHenry 02fe1207ab openjdk9: init at 9.0.0+180
* openjdk 8: code cleanup

as recommended by 0xABAB in #27194

* openjdk 9: init at ea build 176

this starts with copy of 8.nix and just updates hashes and replaces 8
with 9.  it also tweaks the version handling because we aren't dealing
with an update version yet.

* openjdk 9: adapt patches from openjdk 8

fix-java-home: surrounding code changed slightly

swing-use-gtk-jdk9: location of the file being patched changed due to
modularization

read-truststore-from-env: the code that handles the trustStore was
refactored out into a helper class in upstream commit
http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/904861872c0e

adlc_updater: this isn't present anymore

* openjdk 9: make two more warnings-as-errors non-fatal

this requires that we switch to configureFlagsArray to deal with
whitespace

the errors being suppressed are show below:

* For target support_native_java.desktop_libawt_xawt_awt_Robot.o:
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c: In function 'isXCompositeDisplay':
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format
[-Werror=format-contains-nul]
     snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
                                                  ^
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format
[-Werror=format-contains-nul]
cc1: all warnings being treated as errors
* For target support_native_jdk.hotspot.agent_libsa_ps_core.o:
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c: In function 'read_exec_segments':
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c:834:7: error: ignoring return value of 'pread', declared
with attribute warn_unused_result [-Werror=unused-result]
       pread(ph->core->exec_fd, interp_name, exec_php->p_filesz, exec_php->p_offset);
       ^
cc1: all warnings being treated as errors

* openjdk 9: ea+176 -> ea+180

* openjdk 9: TODO disable infinality patches, at least to start

the code being patched here seems to have changed substantially or
perhaps even disappeared altogether.  need to investigate whether
these patches are still relevant.

* openjdk 9: update installPhase for modularization

* separate jdk and jre images are now present under build/*/images

* samples have been removed (JEP 298)
  -- TODO that JEP says demos will be gone too, but it seems some are still present?

* bina directory is no longer present

* openjdk 9: TODO handle *.pf files or purge this code completely

* openjdk 9: update minimal jre components

in particular, the name of the config option for headless has changed,
per https://bugs.openjdk.java.net/browse/JDK-8163102

* TODO about echo -n vs printWords, #27427
2017-09-22 08:27:34 -04:00
Tim Steinbach 7d482d835f
openjdk: 8u152-04 -> 8u144-01
Fix GCC6 build
2017-08-30 23:00:12 -04:00
Will Dietz 43cea71d5b
jdk8: add cflags to fix build w/gcc6 2017-08-15 20:55:09 +02:00
Vladimír Čunát 6899c7fdb9
Merge branch 'master' into gcc-6 2017-08-12 10:09:41 +02:00
Frederik Rietdijk 20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Yann Hodique 9a2a8a5855 java: fix dtrace detection 2017-07-28 09:31:24 -07:00
John Ericson f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
Eelco Dolstra d65e528a37
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-24 18:27:24 +02:00