Commit Graph

278 Commits

Author SHA1 Message Date
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
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