Commit Graph

330 Commits

Author SHA1 Message Date
Robin Gloster
981ae25113
treewide: NIX_*_COMPILE -> string 2019-12-31 00:07:21 +01:00
Ben Wolsieffer
2dea864984 openjdk8: restore correct handling of cmm directory 2019-11-24 09:57:09 +01:00
John Ericson
acd2d19484
Merge pull request #72347 from NixOS/bash-no-undef-vars
treewide: `set -u` everywhere
2019-11-04 19:52:33 -05:00
John Ericson
373236ccff treewide: JAVA_HOME may not always be defined 2019-11-01 22:00:07 +00:00
DzmitrySudnik
d451361b4f java-darwin: upgrade 8.0_121 -> 8.0_222 2019-10-24 12:55:32 -04:00
Matt McHenry
d00559ebb8 openjdk: 12.0.2 -> 13.0.1 2019-10-17 11:47:41 -04:00
Tor Hedin Brønner
1905a6d01e openjfx11: fix build with glib-2.62 2019-09-30 19:39:49 +02:00
Tor Hedin Brønner
203ba052b2 openjfx12: fix build with glib-2.62 2019-09-30 19:39:49 +02:00
Maximilian Bosch
19f88062a6
openjdk8: add setJavaClassPath-hook to jdk as well
This hook got removed from JDK[1], however without this hook,
the classpath in a Java-build isn't created anymore which caused
several[2][3] broken packages.

[1] https://github.com/NixOS/nixpkgs/pull/65247/files#r324459267
[2] https://hydra.nixos.org/build/100896633
[3] https://hydra.nixos.org/build/100895668

ZHF #68361
2019-09-20 21:40:02 +02:00
Ben Wolsieffer
72f76fe856 openjdk8: use lndir instead of single symlink to JRE
Directly symlinking from the JDK to the JRE confused Gradle and made it try to
find JDK files inside the JRE.
2019-09-10 22:20:27 +02:00
Ben Wolsieffer
59d85b9910 openjfx: don't inherit license from openjdk 2019-09-01 17:34:20 +02:00
Ben Wolsieffer
ad4a78fee8 openjdk: add license on Darwin 2019-09-01 17:34:20 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Ben Wolsieffer
5d07172f2f openjdk12: cleanup based on refactoring of openjdk11 2019-08-19 18:54:48 -04:00
Ben Wolsieffer
d4e2cb08ff openjdk11: 11.0.3 -> 11.0.4 2019-08-19 18:54:48 -04:00
Ben Wolsieffer
6f8f3edbda openjdk8: 8u212 -> 8u222 2019-08-19 18:54:48 -04:00
Ben Wolsieffer
4aaaf515dc openjfx: fix package name 2019-08-19 18:54:48 -04:00
Ben Wolsieffer
de5e65ad80 openjdk: boostrap with adoptopenjdk-bin and cleanup
This allows OpenJDK 11 to build for armv6l, armv7l and aarch64, and OpenJDK 8 to
build for aarch64.
2019-08-19 18:54:47 -04:00
Averell Dalton
5ab179b445 openjfx: fix build 2019-08-06 22:26:56 +02:00
Matt McHenry
effc0c8860 openjdk: 12 -> 12.0.2 2019-07-26 10:28:39 -04:00
Matt McHenry
68e3e64398 openjdk: add 12
* some configure options have been removed upstream

* need a new patch to deal with gcc format warnings

11 remains, as it is an LTS release; all existing users of 11 in
nixpkgs remain on 11 for now.

openjdk/default.nix and openjdk/darwin/default.nix become the
expressions for the current version (12 now; later 13, 14, etc.).

(note: darwin/default.nix was unreferenced; the new version is derived
from darwin/11.nix.)
2019-07-25 15:35:50 -04:00
Matt McHenry
0d9e842890 openjdk11: build fixes
* increase heap size for building javadoc (this is only needed for the
  32-bit build)

* filter out some non-maven jars that crop up in the openjfx build
2019-07-25 15:35:50 -04:00
Nikolay Amiantov
9d9eb87c19 openjfx11: init at 11.0.3+1 2019-06-28 15:38:08 +03:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Sarah Brofeldt
b4275f6bd9 openjdk8: Try to remove host kernel version impurity 2019-04-27 08:39:51 -04:00
Tim Steinbach
eb970c5887
openjdk: 11.0.2-b9 -> 11.0.3-ga 2019-04-17 10:05:55 -04:00
Tim Steinbach
0540650f22
openjdk: 8u202 -> 8u212 2019-04-17 10:05:55 -04:00
Cray Elliott
6959c375a5 openjdk11: 11.0.1+13 -> 11.0.2+9 2019-02-21 01:01:04 -08:00
Vladimír Čunát
3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Tim Steinbach
fad6b012bd
openjdk: 8u192 -> 8u202 2019-01-21 12:19:17 -05:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Ivan Kozik
a9c43dd9ef jdk11_headless: fix the build on amd64
This fixes:

checking user specified JVM feature list...
configure: error: Cannot continue
configure: Unknown JVM features specified: "zgc--enable-headless-only"
configure: The available JVM features are: "aot cds cmsgc compiler1 compiler2 dtrace epsilongc g1gc graal jfr jni-check jvmci jvmti link-time-opt management minimal nmt parallelgc serialgc services static-build vm-structs zero zgc"
configure exiting with result code 1
builder for '/nix/store/1awwzd98crcgxad3srdkv8smhxgiz2qp-openjdk-11.0.1-b13.drv' failed with exit code 1
2018-12-11 06:14:21 +00:00
Tim Steinbach
cf8c4e5277
openjdk: 8u181 -> 8u192 2018-11-19 14:08:06 -05:00
Austin Seipp
1629147423 openjdk11: enable ZGC on x86_64-linux
The Z Garbage Collector is a concurrent, scalable, low latency garbage
collector designed to meet extremely-low-pause-time requirements for
small-to-multi-TB heap sizes.

ZGC can be enabled with the magical incantation:

    $ java -XX:+UnlockExperimentalVMOptions -XX:+UseZGC ...

Currently, ZGC is only available for x86_64-linux (though a port for
aarch64-linux may become available at a future time.) There are also a
number of other features that currently aren't present, such as JVMCI
integration (meaning compiler tools like Graal which require JVMCI will
not work with ZGC enabled.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-11-16 20:22:40 -06:00
Matt McHenry
1bd7b98c79 openjdk: 10.0.2 -> 11.0.1
* the jre is no longer an official part of the jdk (jmod is
  recommended as a replacement when needing to create smaller runtime
  images)

* darwin continues to use zulu from azul

* apps that used 10 now use 11 (eclipse, bazel, josm)
2018-10-28 20:35:25 -04:00
Matt McHenry
8b5a759759 jdk: give more detail when bootstrap jdks are missing 2018-10-25 18:30:22 -04:00
Andreas Rammhold
b3029372d0
openjdk10: zulu10.1+11-jdk10 -> zulu10.3+5-jdk10
This is a port of f9788aa to darwin
2018-08-31 22:43:05 +02:00
Andreas Rammhold
f9788aa118 openjdk10: 10.0.1 -> 10.0.2
this fixes a series of potential security issues:

CVE-2018-2940, CVE-2018-2941, CVE-2018-2952, CVE-2018-2964,
CVE-2018-2972 & CVE-2018-2973
2018-08-31 21:26:52 +02:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
adisbladis
1b2cc51031
Merge pull request #45575 from uri-canva/jdk-10-darwin
openjdk10: add darwin support
2018-08-26 00:25:53 +08:00
Uri Baghin
410a51747c openjdk10: add darwin support 2018-08-24 16:35:59 +10:00
Matthew Bauer
5a012fdbb3 Revert "openjdk: fixup build after #44767"
This reverts commit 38eea804e6.
2018-08-22 01:14:53 +02: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
John Ericson
b087618ac0 Revert "stdenv: Store one package per line in nix-support/propagated-*"
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.

This reverts commit 3cb745d5a6.

[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
2017-07-24 01:05:30 -04:00
Tim Steinbach
8e37e3b7f1 openjdk: 8u131-b11 -> 8u141-b15 2017-07-21 16:18:04 +02:00
Eelco Dolstra
a13802b2c8
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-21 11:05:58 +02:00
John Ericson
3cb745d5a6 stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
2017-07-10 13:32:13 -04:00
Robin Gloster
235d5c5c47
openjdk8: 8u131-b11 -> 8u152-b04 2017-05-23 11:24:33 +02:00
Tim Steinbach
fabfec0512
openjdk: 8u121-13 -> 8u131-11 2017-04-19 21:03:55 -04:00
Tim Steinbach
1eea940506
openjdk8: 8u122-04 -> 8u121-13 2017-01-26 20:36:22 -05:00
Tim Steinbach
070ff88fea
openjdk: 8u122-03 -> 8u122-04 2016-10-25 21:42:42 -04:00