3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

70 commits

Author SHA1 Message Date
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01: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
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 373236ccff treewide: JAVA_HOME may not always be defined 2019-11-01 22:00:07 +00: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
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Ben Wolsieffer 6f8f3edbda openjdk8: 8u212 -> 8u222 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
Sarah Brofeldt b4275f6bd9 openjdk8: Try to remove host kernel version impurity 2019-04-27 08:39:51 -04:00
Tim Steinbach 0540650f22
openjdk: 8u202 -> 8u212 2019-04-17 10:05:55 -04:00
Vladimír Čunát 3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Tim Steinbach fad6b012bd
openjdk: 8u192 -> 8u202 2019-01-21 12:19:17 -05:00
rnhmjoj bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +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
Tim Steinbach cf8c4e5277
openjdk: 8u181 -> 8u192 2018-11-19 14:08:06 -05:00
Matthew Bauer 5a012fdbb3 Revert "openjdk: fixup build after #44767"
This reverts commit 38eea804e6.
2018-08-22 01:14:53 +02:00
John Ericson cfa4e0ac14
openjdk: Fix a cross problem
38eea804e6 dropped the C and C++ compiler prefixes. Probably more work is needed to make cross work, but this at least helps preserve/establish the pattern.
2018-08-20 10:16:17 +02:00
Vladimír Čunát 38eea804e6
openjdk: fixup build after #44767 2018-08-19 20:10:07 +02:00
Tim Steinbach 01183f3c89
openjdk: 8u172-b11 -> 8u181-b13 2018-07-29 20:33:57 +00:00
Matthew Bauer 19fc061a13
Merge pull request #43169 from samueldr/fix/stripDirs
Fixes `stripDirs` use after signature change
2018-07-14 19:07:46 -04:00
Samuel Dionne-Riel f8790e0156 openjdk-*: Fixes use of stripDirs. 2018-07-07 22:25:38 -04:00
Jamey Sharp f1c3a610b2 openjdk: fix build for !enableGnome2
This OpenJDK packaging has a headless build configuration controlled by
the `minimal` flag, which is regularly build-tested by Hydra, and a
non-headless configuration based on pure Xlib libraries without Gnome
features, which is not normally tested.

Sometime before OpenJDK 8, the !enableGnome2 case broke, because it
needs to link against libXrandr but that wasn't included in the
buildInputs.

If this patch is backported to NixOS 18.03 or earlier, the same fix
needs to be applied to OpenJDK 9.

I have tested OpenJDK versions 8, 9, and 10, but not any other versions.
2018-06-18 15:25:41 -07:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Tim Steinbach 1b1be29bf8
openjdk: 8u172-b02 -> 8u172-b11 2018-04-28 20:09:17 -04:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Austin Seipp 14e0251362 openjdk8: rename swing patch to be more consistent with the others
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
John Ericson 933e8663ad openjdk: Clean up platform conditionals 2018-02-26 21:17:32 -05:00
Tim Steinbach e1db0afd61
openjdk: 8u152 -> 8u172 2018-01-18 11:22:44 -05:00
Shea Levy d4dbe03be5
Revert "openjdk: 8u152 -> 8u162"
This bump causes the bazel build to fail with:

> Cannot find requested resource bundle for locale en_US

This reverts commit 241e509abd.
2018-01-18 10:07:04 -05:00
Tim Steinbach 241e509abd
openjdk: 8u152 -> 8u162 2018-01-17 10:11:11 -05:00
John Ericson da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Tim Steinbach 1c71b0ef31
openjdk: 8u144 -> 8u152 2017-10-19 08:39:01 -04:00
Matt McHenry 02fe1207ab openjdk9: init at 9.0.0+180
* openjdk 8: code cleanup

as recommended by 0xABAB in #27194

* openjdk 9: init at ea build 176

this starts with copy of 8.nix and just updates hashes and replaces 8
with 9.  it also tweaks the version handling because we aren't dealing
with an update version yet.

* openjdk 9: adapt patches from openjdk 8

fix-java-home: surrounding code changed slightly

swing-use-gtk-jdk9: location of the file being patched changed due to
modularization

read-truststore-from-env: the code that handles the trustStore was
refactored out into a helper class in upstream commit
http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/904861872c0e

adlc_updater: this isn't present anymore

* openjdk 9: make two more warnings-as-errors non-fatal

this requires that we switch to configureFlagsArray to deal with
whitespace

the errors being suppressed are show below:

* For target support_native_java.desktop_libawt_xawt_awt_Robot.o:
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c: In function 'isXCompositeDisplay':
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format
[-Werror=format-contains-nul]
     snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
                                                  ^
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format
[-Werror=format-contains-nul]
cc1: all warnings being treated as errors
* For target support_native_jdk.hotspot.agent_libsa_ps_core.o:
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c: In function 'read_exec_segments':
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c:834:7: error: ignoring return value of 'pread', declared
with attribute warn_unused_result [-Werror=unused-result]
       pread(ph->core->exec_fd, interp_name, exec_php->p_filesz, exec_php->p_offset);
       ^
cc1: all warnings being treated as errors

* openjdk 9: ea+176 -> ea+180

* openjdk 9: TODO disable infinality patches, at least to start

the code being patched here seems to have changed substantially or
perhaps even disappeared altogether.  need to investigate whether
these patches are still relevant.

* openjdk 9: update installPhase for modularization

* separate jdk and jre images are now present under build/*/images

* samples have been removed (JEP 298)
  -- TODO that JEP says demos will be gone too, but it seems some are still present?

* bina directory is no longer present

* openjdk 9: TODO handle *.pf files or purge this code completely

* openjdk 9: update minimal jre components

in particular, the name of the config option for headless has changed,
per https://bugs.openjdk.java.net/browse/JDK-8163102

* TODO about echo -n vs printWords, #27427
2017-09-22 08:27:34 -04:00
Tim Steinbach 7d482d835f
openjdk: 8u152-04 -> 8u144-01
Fix GCC6 build
2017-08-30 23:00:12 -04:00
Will Dietz 43cea71d5b
jdk8: add cflags to fix build w/gcc6 2017-08-15 20:55:09 +02:00
Vladimír Čunát 6899c7fdb9
Merge branch 'master' into gcc-6 2017-08-12 10:09:41 +02:00
Frederik Rietdijk 20b8e4b4cf Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-30 08:09:11 +02:00
Yann Hodique 9a2a8a5855 java: fix dtrace detection 2017-07-28 09:31:24 -07:00
John Ericson f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
Eelco Dolstra d65e528a37
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-24 18:27:24 +02:00
John Ericson b087618ac0 Revert "stdenv: Store one package per line in nix-support/propagated-*"
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.

This reverts commit 3cb745d5a6.

[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
2017-07-24 01:05:30 -04:00
Tim Steinbach 8e37e3b7f1 openjdk: 8u131-b11 -> 8u141-b15 2017-07-21 16:18:04 +02:00
Eelco Dolstra a13802b2c8
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-21 11:05:58 +02:00
John Ericson 3cb745d5a6 stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
2017-07-10 13:32:13 -04:00
Robin Gloster 235d5c5c47
openjdk8: 8u131-b11 -> 8u152-b04 2017-05-23 11:24:33 +02:00
Tim Steinbach fabfec0512
openjdk: 8u121-13 -> 8u131-11 2017-04-19 21:03:55 -04:00
Tim Steinbach 1eea940506
openjdk8: 8u122-04 -> 8u121-13 2017-01-26 20:36:22 -05:00