Commit Graph

483 Commits

Author SHA1 Message Date
Thiago Kenji Okada
2ee1577a1a openjfx15: gradle_5 -> gradle_6 2022-12-13 10:15:29 +00:00
Thiago Kenji Okada
f2cd590cfb openjfx17: 17.0.0.1+1 -> 17.0.5+1 2022-12-13 10:15:07 +00:00
Thiago Kenji Okada
e145132258 openjfx15: mark it as EOL 2022-12-13 10:15:03 +00:00
Thiago Kenji Okada
9e5e9c57bb openjfx11: 11.0.11+1 -> 11.0.17+1 2022-12-13 10:14:37 +00:00
Thiago Kenji Okada
951304c459 openjdk11: 11.0.15+10 -> 11.0.17+8 2022-12-13 10:13:40 +00:00
Thiago Kenji Okada
64b335ce75 openjdk8: 322-ga -> 352-ga 2022-12-13 10:13:40 +00:00
Robert Hensing
16f5747575
Merge pull request #175649 from Artturin/opt-in-structured-attrs
stdenv: support opt-in __structuredAttrs
2022-12-10 21:12:43 +01:00
Sandro
0d6316e7b3
Merge pull request #180032 from amjoseph-nixpkgs/pr/powerpc64le/openjdk-platforms 2022-12-09 10:01:22 +01:00
Artturin
238a6053c4 stdenv: support opt-in __structuredAttrs
Co-authored-by: Robin Gloster <mail@glob.in>

stdenv: print message if structuredAttrs is enabled

stdenv: add _append

reduces the chance of a user doing it wrong

fix nix develop issue

output hooks don't work yet in nix develop though

making $outputs be the same on non-structuredAttrs and structuredAttrs
is too much trouble.

lets instead make a function that gets the output names

reading environment file '/nix/store/2x7m69a2sm2kh0r6v0q5s9z1dh41m4xf-xz-5.2.5-env-bin'
nix: src/nix/develop.cc:299: std::string Common::makeRcScript(nix::ref<nix::Store>, const BuildEnvironment&, const Path&): Assertion `outputs != buildEnvironment.vars.end()' failed.

use a function to get all output names instead of using $outputs

copy env functionality from https://github.com/NixOS/nixpkgs/pull/76732/commits
2022-12-08 06:13:19 +02:00
Thiago Kenji Okada
c12732f882 openjfx15: drop i686-linux support
gradle5 does not support i686-linux, so it is impossible to evaluate
this derivation anyway.
2022-12-06 22:39:20 +00:00
Thiago Kenji Okada
33b058f780 openjfx14: enableJavaFX by default 2022-12-06 22:39:19 +00:00
Thiago Kenji Okada
d0f37a55b1 openjfx13: enableJavaFX by default 2022-12-06 22:39:19 +00:00
Thiago Kenji Okada
4837c5f16a openjfx12: enableJavaFX by default 2022-12-06 22:39:19 +00:00
Thiago Kenji Okada
6d3a447785 openjfx11: enableJavaFX by default 2022-12-06 22:39:19 +00:00
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