Commit Graph

569 Commits

Author SHA1 Message Date
Thiago Kenji Okada
b51a1d1f67 openjfx11: 11.0.3+1 -> 11.0.11+1
This updates the Python version needed to build WebKit from 2 to 3,
fixing the previous issue we had.
2022-12-06 22:39:19 +00:00
github-actions[bot]
f2b70bba3e
Merge master into staging-next 2022-12-02 00:02:32 +00:00
Thiago Kenji Okada
d57353e122 openjdk14: disable JavaFX by default
Since openjfk11 depends on python2 (EOL).
2022-12-01 16:53:25 +00:00
Thiago Kenji Okada
f24ea1f792 openjdk13: disable JavaFX by default
Since openjfk11 depends on python2 (EOL).
2022-12-01 16:53:08 +00:00
Thiago Kenji Okada
76f20f79c6 openjdk12: disable JavaFX by default
Since openjfk11 depends on python2 (EOL).
2022-12-01 16:52:53 +00:00
Thiago Kenji Okada
94491ad9fc openjdk11: disable JavaFX by default
Since openjfk11 depends on python2 (EOL).
2022-12-01 16:52:14 +00:00
github-actions[bot]
cb51cfe745
Merge master into staging-next 2022-11-30 18:01:11 +00:00
Mario Rodas
eed05da3a3
Merge pull request #199802 from jerith666/openjdk-19
OpenJDK: init 19.0.1
2022-11-30 08:01:20 -05:00
Matt McHenry
e7cfa26a86 openjdk: init 19.0.1
as usual this is mostly copy-pasted from 18, so this commit is best
reviewed with '--find-copies-harder'

stop exposing openjdk 18 since it was not a long-term support release

change the default openjdk from 17 to 19 since nixpkgs is a
rolling-release repository

drop the ceremony around bootstrapping via adoptopenjdk for 64-bit
builds vs. via earlier openjdk builds for 32-bit, because, to be
frank, since we're using temurin now, it's not a simple copy-paste
job.  :-/  if someone needs a 32-bit openjdk, that work can be done
separately.

JavaFX revs from 17 to 19; it looks like 18 was never packaged along
with JDK 18.

* the gradle invocation used to build JavaFX must still be done with
  Java 18, as gradle does not yet support running itself on Java 19.

* a couple of patches need to be applied, since a new State enum was
  introduced in the JDK that collides with one in JavaFX.

* the hash of the gradle dependencies has not changed, which is
  surprising, but as far as I can tell correct.

One application (libreoffice) doesn't work with 19 yet, so pin it to
jdk 17 for now.

Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
2022-11-22 20:33:24 -05:00
Sandro
770773936f
Merge pull request #201364 from LibreCybernetics/update-openjdk17 2022-11-18 07:41:09 +01:00
Fabián Heredia Montiel
6bd5e60a40 openjdk17: 17.0.4+8 → 17.0.5+8 2022-11-15 13:37:47 -06:00
Sandro
950b794452
Merge pull request #197304 from vs49688/miniffmpeg-staging 2022-11-12 23:40:47 +01:00
Zane van Iperen
e7bce809ef
openjfx{11,15,17}: use ffmpeg_4-headless
A quick glance at the source shows it only uses libavcodec.
2022-11-08 00:13:24 +10:00
Martin Weinelt
9af8b01842
openjdk: mark 18 as EOL 2022-11-07 01:35:26 +01:00
Nikita Gubarkov
075d9144f8 openjdk: use system Freetype and Harfbuzz
This is needed to avoid duplicate symbols from bundled/system libfontmanager.so and libharfbuzz.so, because this duplication leads to crashes.
2022-10-31 18:30:04 +03:00
Yureka
50ecf779c9 pkgsMusl.jdk: fix build 2022-10-12 20:28:59 +02:00
Ivan Kozik
53256fcdb5 openjfx17: use ffmpeg_4
openjfx17's plugins/av/mpegtsdemuxer.c expects ffmpeg 4 and does not build
with ffmpeg 5.1.1.

This change does not result in any rebuilds because nixpkgs `ffmpeg` still
points to `ffmpeg_4`.
2022-09-24 17:20:30 +00:00
Adam Joseph
f24148ab1f openjdk/meta.nix: add powerpc64le-linux to platforms 2022-09-04 14:05:37 -07:00
K900
739d03743d
Merge pull request #182686 from asbachb/update/openjdk17
openjdk17: 17.0.3+7 -> 17.0.4+8
2022-08-18 18:05:19 +03:00
Benjamin Asbach
e937b6e3ba openjdk17: Remove default java.library.path
see #103493
2022-07-29 22:05:54 +04:00
Benjamin Asbach
0c4d481dbc openjdk17: 17.0.3+7 -> 17.0.4+8 2022-07-24 15:20:54 +04:00
Sergei Trofimovich
e9e734bf17 openjfx11, openjfx15: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
      `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here

openjfx17 is not affected.
2022-06-03 13:48:50 +01:00
Roman Timushev
667e13c619 openjdk17: 17.0.1 -> 17.0.3 (darwin) 2022-05-20 11:14:06 +02:00
Martin Weinelt
dacd54d3f7
openjdk: mark major version 12 through 16 as EOL
https://endoflife.date/java
https://www.azul.com/products/azul-support-roadmap/

Related: #170825
2022-05-05 19:45:49 +02:00
Silvan Mosberger
1f11d01f8a
Merge pull request #169581 from whentze/openjdk-security-2022-04-19
openjdk: 11.0.12+7 -> 11.0.15.+10, 17.0.1+12 -> 17.0.3.+7
2022-04-26 19:40:29 +02:00
Mario Rodas
b66cbbd74e jdk8: fix manpage symlink on darwin 2022-04-22 04:20:00 +00:00
Wanja Hentze
aca95cc459
openjdk: 17.0.1+12 -> 17.0.3.+7
Fixes several security vulnerabilities, see https://openjdk.java.net/groups/vulnerability/advisories/2022-04-19
2022-04-21 15:30:59 +02:00
Wanja Hentze
33bf05f46a
openjdk: 11.0.12+7 -> 11.0.15.+10
Fixes several security vulnerabilities, see https://openjdk.java.net/groups/vulnerability/advisories/2022-04-19
2022-04-21 15:08:35 +02:00
Adam Joseph
9e4ba681fd openjdk: add support for powerpc64le
This commit adds entries to the Rosetta Stones in
adoptopenjdk-bin/generate-sources.py and compilers/openjdk/8.nix, and
runs adoptopenjdk-bin/generate-sources.py to regenerate
adoptopenjdk-bin/sources.json.

With this commit, `nix-build . -A jdk8_headless` succeeds on
powerpc64le.  Headless jdk is used as part of the build process for
many packages so this opens up access to them.
2022-04-11 21:09:54 -07:00
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
Lorenz Brun
7716919300
openjdk8: 8u272-b10 -> 8u322-ga 2022-03-24 14:34:32 +01:00
xeals
da40a449e9 openjdk18: init at 18+36 2022-03-23 12:57:01 +11:00
github-actions[bot]
f6b4a4048a
Merge staging-next into staging 2022-03-09 12:01:59 +00:00
Felix Buehler
783d2679e5 treewide: rename name to pname&version 2022-03-08 13:24:25 +01:00
Maximilian Bosch
8e16dcc4aa
openjdk11: fix build w/glibc-2.34
Failing Hydra build: https://hydra.nixos.org/build/154132196
2022-02-27 10:25:39 +01:00
Nikolay Amiantov
2eefdb5c7d
Merge pull request #155746 from bachp/openjfx17
openjfx17: init at 17.0.0.1+1
2022-02-17 12:44:51 +03:00
Jonathan Ringer
a47d80b669
openjfk: pin ffmpeg to 4x. 2022-02-06 10:41:06 -08:00
Jonathan Ringer
bca5a4fa6e
openjfx15: pin ffmpeg to 4.x 2022-02-05 12:54:49 -08:00
Thibault Gagnaux
a7182cabf8
openjdk8 with javaFX: fix sha256 on aarch64-darwin 2022-01-27 15:46:04 +01:00
Pascal Bach
0db6f946fe openjfx17: init at 17.0.0.1+1 2022-01-22 12:21:48 +01:00
Gabriella Gonzalez
78cad27273 javaPackages.openjdk17: Fix download URL
The current build attempts to fetch
https://cdn.azul.com/zulu/bin/zulu17.30.19-ca-jdk17.0.1-macosx_aarch64.tar.gz
on aarch64-darwin, and that URL does not exist.

Changing the Zulu version to 17.30.19 to 17.30.15 fixes the URL, and
the hash requires no changes, indicating that the hash must have
originally been computed for version 17.30.15 anyway.
2021-12-09 23:50:02 -08:00
Thibault Gagnaux
6893810bd8
openjdk: pin jce-policies to a version using wayback machine
Co-authored-by: SuperSandro2000 <sandro.jaeckel@gmail.com>
2021-12-09 08:23:41 +01:00
Thibault Gagnaux
2c62693eba
openjdk: add zulu javaFX java package on darwin 2021-12-09 08:23:40 +01:00
Thibault Gagnaux
5e4685f943
openjdk8: add zulu javaFX java package on darwin 2021-12-09 08:23:39 +01:00
Thibault Gagnaux
0a16289964
openjdk11: add zulu javaFX java package on darwin 2021-12-09 08:23:39 +01:00
Philipp Dargel
a3401f6e33 OpenJDK: expose more versions
Provide a way to access all JDK versions.
2021-12-02 17:54:20 -08:00
Kevin Cox
dc447918a0
Merge pull request #119444 from lorenzleutgeb/gradle-jdk
gradle: Decouple from JDK 8 and support Java Toolchains
2021-11-22 16:27:10 -05:00
Alexander Bantyev
c8f846893c
openjfx11: require-big-parallel 2021-11-19 22:15:35 +03:00
Lorenz Leutgeb
01f4c7ec88 gradle: Decouple gradleGen and JDK 2021-11-19 18:54:25 +01:00
Sergei Trofimovich
b42767202a openjdk: expliictly mark as 'enableParallelBuilding = false;'
Note: this change does not make build sequential. Build system still
uses it's way to parallelize the build.

The only effect of this change is not to pass unsupported -j option
to Makefile when nixpkgs default will be switched to

    enableParallelBuilding = true;
2021-10-24 14:04:46 +01:00
Sandro
eb7efbbdeb
Merge pull request #140257 from Uthar/jdk17 2021-10-21 20:05:13 +02:00
Kasper Gałkowski
64a379be05 openjdk17: init at 17.0.1+12 2021-10-21 14:18:53 +02:00
Ryan Burns
554d86af20 openjfx11: fix build
Remove -Werror=implicit-function-declaration, which when passed to cmake
for webkit build breaks C++ compiler configuration due to spurious warnings:
`cc1plus: warning: '-Werror=' argument '-Werror=implicit-function-declaration' is not valid for C++`
2021-09-10 21:38:30 +09:00
Mario Rodas
a2df7bb883 jdk: fix manpage symlink on darwin 2021-08-18 19:14:04 -05:00
Wael M. Nasreddine
8dcfd8f20a
openjdk11: fix the share/man symlink on darwin 2021-08-13 12:08:11 -07:00
Arnout Engelen
380b350fb3
jre-minimal: remove unnecessary test file
Looks like we meant to move this file to `tests/test_jre_minimal.nix` but
somehow we accidentally duplicated it.
2021-08-05 09:20:41 +02:00
Frederik Rietdijk
196d3b8291 openjfx11: stay with python2 2021-07-27 20:37:06 +02:00
Benjamin Asbach
13a8746306 openjdk: 11.0.11+9 -> 11.0.12+7 2021-07-21 14:45:26 -06:00
Benjamin Asbach
8c8b704c79 openjdk: 11.0.10+11 -> 11.0.11+9
fixes #128407
2021-06-28 16:25:49 -05:00
Sandro
045784e3fc
Merge pull request #127106 from fzakaria/faridzakaria/jdk11-patch-library
openjdk11: remove default library path
2021-06-17 13:42:10 +02:00
Sandro
71a97e076d
Merge pull request #125498 from Atemu/jetbrains-mainProgram 2021-06-17 01:45:47 +02:00
Sandro
ec9b2e2424
openjdk: update meta.homepage 2021-06-17 01:22:29 +02:00
Farid Zakaria
f9f5f4986b openjdk11: remove default library path
This is a follow up to #123708 which does the similar patch but for
OpenJDK11.

Please see the linked issue for more detailed rationale.
2021-06-16 09:30:24 -07:00
Atemu
9dc58496dd openjdk: correct license 2021-06-16 12:41:18 +02:00
Atemu
75d0e4645e openjdk: extract common meta
Also expands Darwin's openjdk.meta to include most attrs of Linux'
2021-06-16 12:40:34 +02:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Domen Kožar
aeb44a891a
Merge pull request #125184 from domenkozar/aarch64-darwin-eval
Aarch64 darwin eval
2021-06-03 11:21:20 +02:00
Farid Zakaria
fa44962db9 jdk8: fix sprintf patch
This fixes a recent commit via #123708
The patch itself had an additional '%s' in the sprintf which is unsafe
depending on the surrounding memory.
2021-06-01 20:14:20 -07:00
Sandro
bf8430634a
Merge pull request #123708 from fzakaria/faridzakaria/nix-jdk8-library-path
jdk8: Remove default java.library.path
2021-06-01 20:25:28 +02:00
Andrew Childs
ccb99f68e5
(darwin) openjdk: 16.0.0 -> 16.0.1
Also adds aarch64-darwin support

(cherry picked from commit 4288adb8f6)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:47 +02:00
Andrew Childs
a5b2f798eb
(darwin) openjdk11: 11.0.9 -> 11.0.11
Also adds aarch64-darwin support

(cherry picked from commit 1b006e331c)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:26 +02:00
Andrew Childs
1629efe286
(darwin) openjdk8: 8.0.202 -> 8.0.292
Also adds aarch64-darwin support

(cherry picked from commit 00090e0fa4)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:11 +02:00
Robert Schütz
d2f2e638a9
openjfx11: use ffmpeg instead of ffmpeg_3 (#123500) 2021-05-19 23:35:43 +02:00
Farid Zakaria
649f8b67ac jdk8: Remove default java.library.path
This patch fixes https://github.com/NixOS/nixpkgs/issues/103493 for JDK8
only.

I'm upstreaming only for JDK8 to get quorum on the approach and then
adding the patches to the remaining versions.

Improved JDK8 patch

Improved JDK8 patch
2021-05-19 12:36:32 -07:00
Ben Siraphob
682578af42 openjdk: move unzip to nativeBuildInputs 2021-05-16 19:29:28 -07:00
regnat
de2afd359d openjfx: Fix for CA derivations
Manipulating the store paths on the Nix side doesn’t work with CA
derivations (because these paths are just placeholders of the form
`/{hash}` at eval-time)
2021-05-03 18:01:02 +02:00
Sandro
75a24a5bc9
Merge pull request #121170 from samuelgrf/add-mainProgram-to-packages 2021-04-30 01:20:37 +02:00
Samuel Gräfenstein
5ed648975c
openjdk*: add meta.mainProgram 2021-04-29 15:43:50 +02:00
Arnout Engelen
b21d1ae872
jre_minimal: add 2 simple tests 2021-04-28 21:01:46 +02:00
Robert Hensing
fb45a00d63
Merge pull request #115523 from raboof/jre_minimal-strip-library
jre_minimal: strip libraries
2021-04-22 21:34:25 +02:00
Milan Pässler
893972affb jdk: update darwin to 16 as well 2021-04-15 23:12:11 +02:00
Milan Pässler
9dde9d8b9e jdk: 15.0.1-ga -> 16+36 2021-04-15 23:12:11 +02:00
Ben Siraphob
5b8a0c92fe openjdk/darwin: move version out of name 2021-03-22 18:53:04 +07:00
Arnout Engelen
d3e9040686
jre_minimal: strip libraries
runCommand doesn't invoke the automatic stripping from stdenv,
expanding the derivation like this does.

Fixes #115486
2021-03-11 14:27:02 +01:00
John Ericson
f5a7d8bb41
Merge pull request #115228 from siraben/unzip-buildInputs
treewide: unzip buildInputs to nativeBuildInputs (2)
2021-03-06 13:30:43 -05:00
Ben Siraphob
4f0cdb68d7 treewide: unzip buldInputs to nativeBuildInputs (2) 2021-03-06 15:18:05 +07:00
Jan Tojnar
6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
ajs124
fa8551634e openjfx15: python2 -> python3, ffmpeg_3 -> ffmpeg 2021-03-03 02:50:48 +01:00
Robert Schütz
54757b35c1 Merge branch 'staging-next' into staging 2021-02-26 10:56:17 +01:00
Frederik Rietdijk
c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Ben Siraphob
127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
Benjamin Asbach
8d13914346 openjdk: 11.0.9+11 -> 11.0.10+9 2021-02-09 16:09:32 -06:00
Felix Scheinost
7b014876e0 jdk11 (darwin): 11.0.1 -> 11.0.9
1) openjdk/11.nix and openjdk/darwin/11.nix should be at the same version
2) 11.0.1 is affected by TLS 1.3 validation bug https://bugs.openjdk.java.net/browse/JDK-8211806
2021-02-08 13:37:31 +01:00
Fabian Möller
65525be83b
openjfx15: enable i686-linux build 2021-01-26 20:26:28 +01:00
Fabian Möller
be4763a696
openjdk15-bootstrap: fix i686 build 2021-01-24 16:08:57 +01:00
Ben Siraphob
acc5f7b18a pkgs/development/compilers: stdenv.lib -> lib 2021-01-23 08:57:37 +07:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Milan
03a818a6f8
openjdk: build with empty pre-version (#108994)
Some applications, like the Jetbrains IDEs, check for a suffix to
determine if a stable JDK is used.
This flag was already passed for older versions, but it got lost for
OpenJDK 14+.
2021-01-15 05:12:41 +01:00
Matt McHenry
13e3d2bc4b openjdk: 14.0.2 -> 15.0.1
* update two explicit references to jdk14 to just jdk, which no longer
  points at jdk8 after #89731.

* patch an explicit -XX:+UseConcMarkSweepGC to -XX:UseG1GC, as the
  former now throws an error (after having been deprecated since jdk 9)
2020-12-26 11:58:06 -05:00
Doron Behar
8023e3c42a openjdk*: Add gtk3 to passthru of all versions 2020-11-26 09:55:32 -05:00
Doron Behar
3e48a6db49 openjdk: Merge passthrus
Fixes #104680.
2020-11-26 09:55:32 -05:00
Tim Steinbach
01816a4bf1
Merge pull request #102418 from asbachb/openjdk11-from-github
openjdk: download from mercurial repository to GitHub
2020-11-16 20:26:05 -05:00
Doron Behar
450c9c9c3f
Merge pull request #101456 from doronbehar/pkg/yed
yed: wrap With wrapGAppsHook - fixes #101135
2020-11-05 13:48:51 +02:00
Robert Hensing
d24360033d
Merge pull request #98383 from raboof/document-jre
openjdk: add derivation to generate bespoke minimal JRE's
2020-11-05 10:40:39 +01:00
Arnout Engelen
d4efa08b53
openjdk: add derivation to generate bespoke minimal JRE's
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
2020-11-04 17:47:18 +01:00
Benjamin Asbach
aefda81a05 openjdk: switch from mercurial repository to GitHub
Reasons:
* openjdk is migrating to GitHub (https://openjdk.java.net/jeps/369)
* GitHub provides faster download speed that mercurial
2020-11-04 16:07:17 +00:00
Tim Steinbach
41f017c564
Merge pull request #102360 from asbachb/update/openjdk8
openjdk: 1.8.0_265 -> 1.8.0_272
2020-11-04 10:00:42 -05:00
Benjamin Asbach
5db66b2678 openjdk:openjdk8: 1.8.0_265 -> 1.8.0_272 2020-11-01 17:02:02 +01:00
Benjamin Asbach
e65953742b openjdk: 11.0.8 -> 11.0.9 2020-11-01 01:00:13 +01:00
Doron Behar
919df81df1 yed: wrap With wrapGAppsHook - fixes #101135
Use preFixup to setup the wrapper properly, without double wrapping.
2020-10-23 14:45:25 +03:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Tim Steinbach
6224bfd839
openjdk8: Remove maintainer nequissimus 2020-10-08 11:00:18 -04:00
Milan
5622b6b6fe
openjfx14: correctly remove references to jdk11 (#96298)
The new version string for jdk11 contains a '+' character, which needs
to be escaped for use in the sed command.
Fixes #95117.
2020-08-26 23:35:20 +02:00
Tim Steinbach
b71dc9d264
Merge pull request #94789 from jerith666/openjdk-8u265
openjdk8: 1.8.0_242 -> 1.8.0_265
2020-08-07 09:03:49 -04:00
Matt McHenry
0afe6a282a openjdk8: 1.8.0_242 -> 1.8.0_265 2020-08-06 09:29:48 -04:00
Benjamin Hipple
759eb65d2a
Merge pull request #94548 from bachp/openjdk14-14.0.2
openjdk14: 14.0.1 -> 14.0.2
2020-08-02 11:37:27 -04:00
Pascal Bach
ef7c2d3cea openjdk14: 14.0.1 -> 14.0.2 2020-08-02 13:48:00 +02:00
Benjamin Asbach
56cff958e8 openjdk: 11.0.7 -> 11.0.8
Also added `minor` variable to reflect naming scheme introduced in java 9: https://bugs.openjdk.java.net/browse/JDK-8061493
2020-08-02 09:00:39 +02:00
Milan
56fcf7891b
openjdk: build with empty pre-version (#92947)
The removes the "-internal" suffix from the OpenJDK version string.
Some applications, like the Jetbrains IDEs, check for a suffix to
determine if a stable JDK is used.
Thanks to @liff for the hint in #92837!
2020-07-25 17:21:41 +02:00
Florian Klink
ccaa301add
Merge pull request #90234 from asbachb/update-jdk-11.0.7
openjdk: 11.0.6 -> 11.0.7
2020-06-19 00:38:08 +02:00
Sarunas Valaskevicius
64a39be321 openjdk14: add symlink for src.zip 2020-09-29 17:40:48 +01:00
Sarunas Valaskevicius
daadfcfb82 openjdk11: use symlink instead of another copy for src.zip 2020-09-29 11:52:37 +01:00
Sarunas Valaskevicius
7cee92a1cc openjdk11: add src.zip for IDEs 2020-09-29 10:26:39 +01:00
Benjamin Asbach
890485a2bd openjdk: 11.0.6 -> 11.0.7 2020-06-13 11:53:11 +00:00
Benjamin Asbach
1c61d8707a openjdk: added myself as maintainer 2020-06-13 11:53:11 +00:00
Doron Behar
01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Pavol Rusnak
6abf4a43ad
treewide: per RFC45, remove more unquoted URLs 2020-05-08 15:20:47 +02:00
Matt McHenry
54af710269 openjdk: 13.0.2 -> 14.0.1 2020-05-07 18:18:32 +02:00
Matt McHenry
7b7cb7b876 openjdk 12: fix possibly-unbound JAVA_HOME
as done in 373236ccff for all other uses
2020-05-07 18:18:32 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Matt McHenry
36ae82fd3a openjdk: 13.0.1 -> 13.0.2 2020-03-09 14:08:30 -04:00
Matt McHenry
1b8719437b Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13
Conflicts:
	pkgs/development/compilers/adoptopenjdk-bin/sources.json
          -- keep newer adoptopenjdk versions from HEAD^2
2020-03-09 12:29:43 -04:00
Benjamin Asbach
b87e7d00f3 openjdk8: 8u222b10 -> 8u242b08 2020-02-17 01:06:45 +01:00
Benjamin Asbach
36c53f703b openjdk8: 8u222 -> 8u242 2020-02-13 03:55:16 +01:00
Frederik Rietdijk
cdff57e1fc Merge staging-next into staging 2020-01-28 10:48:36 +01:00
Alexey Vakhrenev
4dc3337f80 openjdk11: 11.0.4 -> 11.0.6 2020-01-22 15:10:45 +03:00
hlolli
78b34b5e5b
graalvm8: 19.1.1 -> 19.2.1
- - nixpkgs now with full darwin support
2020-01-18 16:43:03 +01:00
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
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