Commit graph

17 commits

Author SHA1 Message Date
Tom Fitzhenry
6bae07337e Remove libfreetype.so from adoptopenjdk's derivation.
This caused some reverse dependencies of adoptopenjdk to depend on
adoptopenjdk's libfreetype, rather than the NixOS
libfreetype. For example: https://github.com/NixOS/nixpkgs/issues/57733

Now the derivation does not contain libfreetype.so . The JRE links to
nixpkg's freetype:

$ ldd /nix/store/9iyxm1nkn35xhjgri041r980z4p5ls5g-adoptopenjdk-hotspot-bin-11.0.2/lib/libfontmanager.so | grep -i freetype
	libfreetype.so => /nix/store/ycbkq39cngzx19j829qzgdnw3mx3z78g-freetype-2.9.1/lib/libfreetype.so (0x0000795e30702000)
2019-03-16 22:43:47 +11:00
Vladimír Čunát
94b518f855
Merge #54576: adoptopenjdk-bin: 11.0.1 -> 11.0.2
Includes security fixes.
2019-02-17 09:45:21 +01:00
taku0
8050d594d3 adoptopenjdk-bin: 11.0.1 -> 11.0.2 (openj9 x86_64-darwin) 2019-01-31 16:44:34 +09:00
Vladimír Čunát
185d88c515
adoptopenjdk-bin: fail in a good way when unsupported
It was breaking the tarball job:
https://hydra.nixos.org/build/87863422
2019-01-27 10:46:07 +01:00
taku0
25eabb785c adoptopenjdk-bin: 11.0.1 -> 11.0.2 (hotspot aarch64-linux, x86_64-mac) 2019-01-26 20:47:40 +09:00
taku0
3a99772d07 adoptopenjdk: 11.0.1 -> 11.0.2 (x86_64-linux only) 2019-01-23 20:52:02 +09:00
Jan Tojnar
ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Benno Fünfstück
6972c433ab adoptopenjdk-bin: disable openj9 jre for mac due to missing upstream 2018-12-19 14:08:15 +01:00
Robert Schütz
682d1befd9 adoptopenjdk-bin: use python-withPackages for shebang
Co-Authored-By: bennofs <benno.fuenfstueck@gmail.com>
2018-12-19 14:08:12 +01:00
Benno Fünfstück
5bbfc0cc37 adoptopenjdk: autogenerate sources + add support for aarch64 2018-12-19 14:08:09 +01:00
Frederik Rietdijk
a9e654e1bd Revert "adoptopenjdk: autogenerate sources + add support for aarch64 (#52454)"
This reverts commit f2dfe8b9e6, reversing
changes made to e116aa1d4b.

The `openj9` attribute is missing for `jre` in case of `mac`. This missing
attribute is now blocking the channels from updating.

cc @bennofs
2018-12-19 10:11:17 +01:00
Robert Schütz
23859991e9
adoptopenjdk-bin: use python-withPackages for shebang
Co-Authored-By: bennofs <benno.fuenfstueck@gmail.com>
2018-12-18 20:24:58 +01:00
Benno Fünfstück
5a44fef594 adoptopenjdk: autogenerate sources + add support for aarch64 2018-12-17 23:08:56 +01:00
taku0
3cfa035a99 adoptopenjdk-openj9-bin: 11 -> 11.0.1 2018-11-03 22:00:56 +09:00
taku0
7c3dd045ce adoptopenjdk-bin: support darwin platform 2018-10-28 13:52:12 +00:00
taku0
8faebb17ac adoptopenjdk-bin: init at 11 2018-10-28 13:52:12 +00:00