Commit Graph

409 Commits

Author SHA1 Message Date
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