Commit Graph

507 Commits

Author SHA1 Message Date
Martin Weinelt
94c8c31bee
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/numba/default.nix
2023-10-15 22:31:34 +02:00
Artturin
849e4dc5ff openjfx: respect NIX_BUILD_CORES in nested cmake
Building `openjfx11` or `openjfx12` on a machine with many cores can consume huge amounts of RAM. With 24 cores, the memory usage exceeded `25GB` per build for me.

Using `NIX_BUILD_CORES` to reduce the number of parallel tasks doesn't help, because a script invoking `cmake` does not respect `NIX_BUILD_CORES` and passes `-j <number of cores>`.

Setting `NUMBER_OF_PROCESSORS` overrides the automatic core count detection in the script.

https://github.com/search?q=repo%3Aopenjdk%2Fjfx%20NUMBER_OF_PROCESSORS&type=code

Co-authored-by: Fabian Möller <fabianm88@gmail.com>
2023-10-15 04:56:01 +03:00
github-actions[bot]
2df946c4bd
Merge master into staging-next 2023-10-09 00:02:27 +00:00
Weijia Wang
18c9af9f37 zulu21: deduplicate expressions 2023-10-08 23:15:19 +02:00
Infinidoge
82c294f13a
openjdk21, openjfx21: init at 21 (#258507)
Uses temurin-bin-20 to bootstrap, as temurin-bin-21 hasn't been released yet
2023-10-08 23:11:55 +02:00
Weijia Wang
f0e1ff90d5 Merge branch 'master' into staging-next 2023-10-08 20:10:26 +02:00
Weijia Wang
2e692b3ddb zulu: add darwin support 2023-10-08 17:34:23 +02:00
Weijia Wang
8d8796f341 openjdk: add linux support for zulu builds 2023-10-08 01:04:34 +02:00
Weijia Wang
e075853151 openjdk: generalize platforms for zulu builds 2023-10-08 00:27:47 +02:00
Weijia Wang
7251451049 openjdk: refactor meta on darwin 2023-10-08 00:15:29 +02:00
Weijia Wang
d9c87993d3 openjdk: deduplicate expressions on darwin 2023-10-07 21:49:21 +02:00
github-actions[bot]
e0e21b78ec
Merge master into staging-next 2023-09-29 00:02:21 +00:00
Jakub Janczak
dddc404051 openjdk17: 17.0.8 -> 17.0.8.1 (darwin) 2023-09-28 21:00:43 +02:00
Edward Tjörnhammar
b88fa28cce openjdk1{2,3,4,5,6,8}: quickfix, add images build
buildFlags doesn't properly take and need to be manually applied in postBuild,
in some cases.. harfbuzz is also unreliantly thrown.

Mark 1{3,4} as broken.
2023-09-19 07:00:33 +02:00
SirYwell
b7e6824330 openjdk: remove explicit flag to include ZGC
Since Java 15, ZGC is a default JVM feature and therefore does not need to be
enabled explicitly. The platforms it is available on automatically include it,
rendering the explicit flag obsolete.
2023-09-19 07:00:33 +02:00
Theodore Ni
ef0add88dd
javaPackages.compiler.openjdk20: add zulu javaFX java package on darwin 2023-08-11 13:39:29 -07:00
Theodore Ni
12871db0ee
javaPackages.compiler.openjdk19: add zulu javaFX java package on darwin 2023-08-11 13:39:29 -07:00
Theodore Ni
b89c4a12c2
javaPackages.compiler.openjdk18: add zulu javaFX java package on darwin 2023-08-11 13:39:29 -07:00
Theodore Ni
e795ddf93d
javaPackages.compiler.openjdk17: add zulu javaFX java package on darwin 2023-08-11 13:39:29 -07:00
Weijia Wang
b067d888c8 openjdk{8-20}: bump darwin version 2023-08-05 02:04:45 +02:00
sohalt
eacd9ad04d
openjdk: init at 20+36 and openjfx: init at 20+19 2023-07-02 07:52:14 +08:00
Fabián Heredia Montiel
b8ad87becf openjdk17: 17.0.6+10 → 17.0.7+7 2023-06-13 20:35:11 -06:00
Fabián Heredia Montiel
1997c731f1 openjdk11: 11.0.18+10 → 11.0.19+7 2023-06-13 20:35:11 -06:00
Charlotte Van Petegem
cf69135539
openjfx17: fix building with webkit 2023-05-23 15:36:57 +02:00
K900
2e07e19dbd openjdk: explicitly specify build platform to avoid WSL autodetection shenanigans
Fixes #204152
2023-04-15 16:24:07 +03:00
Sandro Jäckel
8204a95ef2 openjdk: bootstrap headless variant with headless openjdk
This makes bootstrapping work when environment.noXlibs is set to true
2023-04-14 22:23:39 -03:00
figsoda
21c659d543 javaPackages.compiler.openjdk15: fix eval 2023-04-04 12:28:07 -04:00
github-actions[bot]
a912b83051
Merge master into staging-next 2023-03-18 12:01:30 +00:00
Sergei Trofimovich
e4bcf6d967
Merge pull request #220820 from trofi/openjdk-location
openjdk{15..19}: fix position location
2023-03-18 09:40:01 +00:00
Sergei Trofimovich
7b53fc5241 openjdk11: port to gnumake-4.4.1
Revert e6d4aecb97 "revert back to gnumake-4.4 as gnumake-4.4.1
breaks the build" and aply the fix from

https://github.com/openjdk/jdk/pull/12992
2023-03-12 12:25:46 +00:00
Sergei Trofimovich
544ef3138a openjdk: port to gnumake-4.4.1
Revert e6d4aecb97 "revert back to gnumake-4.4 as gnumake-4.4.1
breaks the build" and aply the fix from

https://github.com/openjdk/jdk/pull/12992
2023-03-12 12:25:45 +00:00
Sergei Trofimovich
6ab299b3a3 openjdk: port to gnumake-4.4.1
Revert 41a6b03b89 "revert back to gnumake-4.4 as gnumake-4.4.1
breaks the build" and aply the fix from

https://github.com/openjdk/jdk/pull/12992
2023-03-12 12:25:45 +00:00
Sergei Trofimovich
bb1d5781e4 openjdk{15..19}: fix position location
Before this change `ix edit -f. jdk` command pointed at shared metadata.
2023-03-12 12:24:13 +00:00
Sergei Trofimovich
3c99ad4dd4 openjdk11: revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build
Without the change `openjdk` build fails on `staging-next` as:

       > installing
       > mv: missing destination file operand after '/nix/store/pwgvafi1xwa6l0dygmcyr1sl27dhpy67-openjdk-19.0.2+7/lib/openjdk'
       > Try 'mv --help' for more information.
2023-03-04 21:55:09 +00:00
Sergei Trofimovich
e6d4aecb97 openjdk17: revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build
Without the change `openjdk` build fails on `staging-next` as:

       > installing
       > mv: missing destination file operand after '/nix/store/pwgvafi1xwa6l0dygmcyr1sl27dhpy67-openjdk-19.0.2+7/lib/openjdk'
       > Try 'mv --help' for more information.
2023-03-04 21:52:53 +00:00
Sergei Trofimovich
41a6b03b89 openjdk: revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build
Without the change `openjdk` build fails on `staging-next` as:

       > installing
       > mv: missing destination file operand after '/nix/store/pwgvafi1xwa6l0dygmcyr1sl27dhpy67-openjdk-19.0.2+7/lib/openjdk'
       > Try 'mv --help' for more information.
2023-03-04 21:48:54 +00:00
figsoda
18a6d5d132 openjfx19: add gtk2 2023-03-03 13:57:36 -05:00
figsoda
b434398a50 openjfx17: add gtk2 2023-03-03 13:57:36 -05:00
figsoda
4eaa0c57d9 openjfx11: add gtk2 2023-03-03 13:57:36 -05:00
github-actions[bot]
52a11b56f9
Merge master into staging-next 2023-02-25 18:01:03 +00:00
Benjamin Asbach
546f356db6 remove myself as maintainer for now as I switched to another distro 2023-02-25 18:56:02 +01:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
Thiago Kenji Okada
ce6bc62d48 openjdk19: disable JavaFX by default
JavaFX is an optional component of Java since version 11, not used by
most applications and also a source of many security issues (i.e.: it
bundles both media codecs and WebKit). Also, it is only available in
some platforms.

So this commit will disable JavaFX by default, that will allow us to
reduce the closure size significantly and reduce the attack surface of
Java applications for most users. Derivations that needs it can always
override the parameter themselves.
2023-02-04 12:25:31 +00:00
Thiago Kenji Okada
6ba603bcc9 openjdk18: disable JavaFX by default
JavaFX is an optional component of Java since version 11, not used by
most applications and also a source of many security issues (i.e.: it
bundles both media codecs and WebKit). Also, it is only available in
some platforms.

So this commit will disable JavaFX by default, that will allow us to
reduce the closure size significantly and reduce the attack surface of
Java applications for most users. Derivations that needs it can always
override the parameter themselves.
2023-02-04 12:25:29 +00:00
Thiago Kenji Okada
83a10248e3 openjdk17: disable JavaFX by default
JavaFX is an optional component of Java since version 11, not used by
most applications and also a source of many security issues (i.e.: it
bundles both media codecs and WebKit). Also, it is only available in
some platforms.

So this commit will disable JavaFX by default, that will allow us to
reduce the closure size significantly and reduce the attack surface of
Java applications for most users. Derivations that needs it can always
override the parameter themselves.
2023-02-04 12:25:27 +00:00
Thiago Kenji Okada
644ec84b74 openjdk16: disable JavaFX by default
JavaFX is an optional component of Java since version 11, not used by
most applications and also a source of many security issues (i.e.: it
bundles both media codecs and WebKit). Also, it is only available in
some platforms.

So this commit will disable JavaFX by default, that will allow us to
reduce the closure size significantly and reduce the attack surface of
Java applications for most users. Derivations that needs it can always
override the parameter themselves.
2023-02-04 12:25:25 +00:00
Thiago Kenji Okada
4161997c71 openjdk15: disable JavaFX by default
JavaFX is an optional component of Java since version 11, not used by
most applications and also a source of many security issues (i.e.: it
bundles both media codecs and WebKit). Also, it is only available in
some platforms.

So this commit will disable JavaFX by default, that will allow us to
reduce the closure size significantly and reduce the attack surface of
Java applications for most users. Derivations that needs it can always
override the parameter themselves.
2023-02-04 12:25:23 +00:00
Thiago Kenji Okada
0ff244342e openjdk14: disable JavaFX by default
JavaFX is an optional component of Java since version 11, not used by
most applications and also a source of many security issues (i.e.: it
bundles both media codecs and WebKit). Also, it is only available in
some platforms.

So this commit will disable JavaFX by default, that will allow us to
reduce the closure size significantly and reduce the attack surface of
Java applications for most users. Derivations that needs it can always
override the parameter themselves.
2023-02-04 12:25:21 +00:00