Commit Graph

438 Commits

Author SHA1 Message Date
github-actions[bot]
0c98bf3e85
Merge staging-next into staging 2023-01-05 00:02:56 +00:00
sternenseemann
b711b52d15 jre, temurin-bin: fix eval in pkgsCross.ghcjs.buildPackages
Since #200337 gobject-introspection propagates itself via
depsTargetTargetPropagated, so one doesn't have to add it to every
derivation twice. The problem is that gobject-introspection still is in
a lot of buildInputs and will thus propagate itself again for target,
breaking evaluation unnecessarily if gobject-introspection doesn't
evaluate on whatever the target platform turns out to be.

temurin-bin and openjdk19 caused such a situation via gtk3 which GHC's
JavaScript backend depends on. To fix evaluation of those packages in
pkgsCross.ghcjs.buildPackages, we'll just disable the features pulling
in gtk3 until this is fixed properly.
2023-01-04 00:02:29 +01:00
github-actions[bot]
887e342eaa
Merge staging-next into staging 2022-12-17 18:01:35 +00:00
Yureka
77822a6afa pkgsMusl.jdk: fix build 2022-12-17 18:27:40 +01:00
Yureka
8a2a94078b pkgsMusl.javaPackages.compiler.openjdk18: fix build 2022-12-17 18:27:40 +01:00
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