Commit graph

480 commits

Author SHA1 Message Date
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
Thiago Kenji Okada 3db2a9d2d3 openjdk13: 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:19 +00:00
Thiago Kenji Okada 368a7a0285 openjdk12: 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:16 +00:00
Thiago Kenji Okada c51774444c openjdk11: 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:19:13 +00:00
Thiago Kenji Okada a41cfc36f5 openjfx19: remove gtk2 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada 1caf19b8e0 openjfx19: add with{Media,Webkit} options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada c6323fe258 openjfx17: remove gtk2 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada d7c4a9bf93 openjfx17: add with{Media,Webkit} options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada a76479057a openjfx15: remove gtk2 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada 390227326d openjfx15: add with{Media,Webkit} options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada 45d339096f openjfx11: remove gtk2 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada 976849f2e6 openjfx11: remove unnecessary NIX_CFLAGS_COMPILE options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada 640c102321 openjfx11: add with{Media,Webkit} options 2023-02-04 12:17:06 +00:00
Thiago Kenji Okada 0685060feb openjfx19: 19+11 -> 19.0.2.1+1 2023-02-03 18:05:35 +00:00
Thiago Kenji Okada 89b1bf06df openjdk19: 19.0.1+10 -> 19.0.2+7 2023-02-03 18:05:35 +00:00
Thiago Kenji Okada a8c155e0f6 openjfx17: 17.0.5+1 -> 17.0.6+3 2023-02-03 10:47:29 +00:00
Benjamin Asbach 42d51f710a openjdk17: 17.0.5+8 -> 17.0.6+10 2023-02-03 10:47:29 +00:00
Thiago Kenji Okada 61de80e499 openjfx11: 11.0.17+1 -> 11.0.18+1 2023-02-03 00:09:51 +00:00
Thiago Kenji Okada c1c6d7325c openjdk11: 11.0.17+8 -> 11.0.18+10 2023-02-03 00:01:06 +00:00
Thiago Kenji Okada c62f7d2457 openjdk8: 352-ga -> 362-ga 2023-02-02 23:54:59 +00:00
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