3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

194 commits

Author SHA1 Message Date
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
Tim Steinbach 070ff88fea
openjdk: 8u122-03 -> 8u122-04 2016-10-25 21:42:42 -04:00
Tim Steinbach e4c38f36dd
openjdk: 8u122-00 -> 8u122-03 2016-10-22 14:27:12 -04:00
Nikolay Amiantov 9d7c9cc32e openjdk8: add a patch to use GTK when available by default 2016-10-02 23:57:10 +03:00
Nikolay Amiantov a15c943337 openjdk8: rework dependencies
This makes several adjustments around what is linked into JRE.

* system giflib, libjpeg, zlib are now used unconditionally;
* libstdc++ is linked dynamically.

For full version:

* GTK+ and GNOME libraries are linked;
* Extra X11 libraries are linked;
* CUPS is linked;
* libmagic (file) is linked.

For minimal version:

* All X11 support is removed;
* Sound support is removed.
* Fonts and their support are not lined.

jre8_headless is added as a minimal build.

Overall this adds support for all things GUI into the default Java build and
removes them from the minimal build.
2016-10-02 23:57:02 +03:00
Tim Steinbach 83a893c38a
openjdk7: 1.7.0-91 -> 1.7.0-111 2016-09-23 08:45:38 -04:00
reltuk 3e695874e2 openjdk: Keep {include,man} in $out/lib/opendjk. (#18140)
* openjdk: Keep {include,man} in $out/lib/opendjk.

This is a standard layout that some JDK consumers expect.

* openjdk/8: Improve clarity of some symlink commands with terminating slash.
2016-09-01 21:00:41 +02:00
Tim Steinbach 8a7afae58b openjdk: Fix #17603 2016-09-01 20:47:19 +02:00
Vladimír Čunát f616c0f1f0 openjdk7: fix build with glibc-2.24
I tested this patch for both versions but I forgot to push
and 8 got fixed in the meantime 44dc95ef5.
2016-08-20 18:00:10 +02:00
obadz 8856b9e905 openjdk: 8u102b04 -> 8u122b00 2016-08-20 16:32:08 +01:00
obadz 44dc95ef53 openjdk8: add compiler flag to cope with glibc 2.24 2016-08-20 16:32:08 +01:00
Profpatsch 632411c2b6 openjdk7: replace vulnerable cups version (#17214)
Fixes #7407.
Also uses the nixpkgs version of cups, not a static one that is never
maintained.
2016-07-28 03:23:21 +02:00
Tim Steinbach f7ab8f80a0 openjdk: 8u92b14 -> 8u102b04 2016-06-16 22:19:41 +00:00
Tim Steinbach 84bf43a702 openjdk: 8u76 -> 8u92 2016-05-03 00:17:45 +00:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Edward Tjörnhammar e8cc9204a8 Merge pull request #12568 from gebner/idea-openjdk8
idea: fix problems with openjdk8
2016-01-24 10:29:54 +01:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Gabriel Ebner b47d2f8029 openjdk8: do not symlink icc profiles 2016-01-23 13:22:48 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III a5ea7cd1d1 openjdk: 8u72b04 -> 8u76b00 2015-11-10 18:27:19 -08:00
William A. Kennington III 95c22086a6 openjdk: 7u85b02 -> 7u91b01 2015-11-10 18:26:52 -08:00
Joel Moberg bd3099ff6f openjdk: add infinality patch to improve font-rendering 2015-11-03 14:59:16 +01:00
William A. Kennington III be63d58974 openjdk8: u60b24 -> u72b04 2015-10-24 09:30:36 -07:00
William A. Kennington III 55a4156389 openjdk7: u80b32 -> u85b02 2015-10-24 09:30:35 -07:00
Vladimír Čunát 1a5d465395 openjdk: fix build with multiple outputs
It seems freetype can't be found by that flag anymore, after it has been
split, but pkgconfig is a better option anyway (tested it finds it).
2015-10-13 20:18:58 +02:00
Vladimír Čunát 1fdbc3097b alsa-lib: split "dev" output and fix referrers 2015-10-13 20:18:55 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Bryan Gardiner 4140c7fe16
openjdk8: add the architecture passthru from openjdk7 2015-09-16 06:42:22 -07:00
Eelco Dolstra b0fd35e174 openjdk8: Add missing setup hooks 2015-09-14 18:28:52 +02:00
Eelco Dolstra 7a1aa50908 Rename OpenJDK expressions
It's silly to have OpenJDK 7 in default.nix when it's not in fact the
default.
2015-09-14 18:28:48 +02:00
William A. Kennington III be48876349 openjdk: 8u40b27 -> 8u60b24 2015-07-17 18:00:49 -07:00
Shea Levy 145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
William A. Kennington III 240338638e openjdk7: Fix refernces to the bootstrap 2015-06-08 13:56:29 -07:00
William A. Kennington III 6e68e874b5 openjdk8: Fix refernces to the bootstrap 2015-06-08 00:00:12 -07:00
William A. Kennington III a5ef488b11 opendjk: Make boostraps for each major version and update openjdk7 2015-06-07 21:02:02 -07:00
William A. Kennington III 0cc68fa478 openjdk-make-bootstrap: Use openjdk8 2015-06-07 21:02:02 -07:00
William A. Kennington III bdcb721546 java: Refactor top level and build ordering 2015-06-07 21:02:02 -07:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00