3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

304 commits

Author SHA1 Message Date
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
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
Matt McHenry 0d9e842890 openjdk11: build fixes
* increase heap size for building javadoc (this is only needed for the
  32-bit build)

* filter out some non-maven jars that crop up in the openjfx build
2019-07-25 15:35:50 -04:00
Nikolay Amiantov 9d9eb87c19 openjfx11: init at 11.0.3+1 2019-06-28 15:38:08 +03:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Sarah Brofeldt b4275f6bd9 openjdk8: Try to remove host kernel version impurity 2019-04-27 08:39:51 -04:00
Tim Steinbach eb970c5887
openjdk: 11.0.2-b9 -> 11.0.3-ga 2019-04-17 10:05:55 -04:00