Commit Graph

56 Commits

Author SHA1 Message Date
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
taku0
5bf6a2bca5 oraclejdk: 9 -> 9.0.1 2017-10-18 20:59:44 +09:00
taku0
08075d57e8 oraclejdk: 8u144 -> 8u151, 8u152 2017-10-18 03:13:23 +09:00
taku0
692fcd9f53 oraclejdk: add version 9
Oracle JDK 9 does not seems to contain jre directory, so oraclejre9
package now uses a dedicated archive file.

There is no 32-bit version nor arm version (yet). If Oracle releases
them, I will update the package.
2017-09-23 17:47:12 +09:00
volth
b32a1199f8 orackejdk: untie from gnome2
Nothing should change unless you override ```gtk2``` or ```gnome2.gtk``` so they become different
2017-08-08 02:16:26 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Kamil Chmielewski
529f809564 oraclejdk: updated arm checksums 2017-07-27 09:52:06 +02:00
taku0
b602082e07 oraclejdk: 8u141 -> 8u144 2017-07-27 08:19:03 +02: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
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
taku0
3e502bc73a oraclejdk: 8u131 -> 8u141 2017-07-19 03:12:30 +09:00
Eric Litak
00335098a5 oraclejdk8: armv7l support 2017-07-16 05:16:59 -07: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
Benjamin Staffin
ad0ad62c31
oraclejdk: 8u121 -> 8u131 2017-04-19 00:13:17 -04:00
taku0
4f94657bee oraclejdk: 8u111, 8u112 -> 8u121 2017-01-18 09:12:40 +09:00
Tim Steinbach
b922bedc46
oraclejdk: 8u101/102 -> 8u111/112 2016-10-19 19:57:13 -04:00
Graham Christensen
38c5876b2d
oraclejdk7: remove due to end of life 2016-09-28 16:39:12 -04:00
Franz Pletz
0ccb59b562
jdkdistro: remove oraclejdk6, not maintained anymore 2016-09-26 13:40:20 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
taku0
afcf3176ec oraclejdk: 8u91, 8u92 -> 8u101, 8u102 (#17125) 2016-07-20 18:00:11 +02:00
taku0
9e572418a2 oraclejdk: Revert "oraclejdk8: 8u91 -> 8u92" (#15820)
This reverts commit 9e56f3a9b5.

8u91 is Critical Patch Update (CPU), contains security vulnerability fixes.
8u92 is Patch Set Update (PSU), contains security vulnerability fixes
and other bug fixes.

Oracle says "Oracle strongly recommends that all Java SE users upgrade
to the latest CPU release available for a release family. Most users
should choose the CPU release."
http://www.oracle.com/technetwork/java/javase/downloads/cpu-psu-explained-2331472.html

So I made `oraclejdk8` package and `oraclejdk8psu` package for CPU and PSU.
2016-05-30 03:34:39 +02:00
Franz Pletz
9e56f3a9b5 oraclejdk8: 8u91 -> 8u92 2016-05-13 17:27:00 +02:00
Franz Pletz
d510563837 oraclejdk8: jmc is only available in jdk, not in jre 2016-05-13 17:27:00 +02:00
Joachim Fasting
0a9b7b3159 Merge pull request #15155 from yawnt/java-source-files
jdk: keep source files for IDE support
2016-05-07 17:45:32 +02:00
yawnt
84df0ba64c jdk: refactor install phase, avoid deleting source files needed for IDE support 2016-05-02 12:01:50 +02:00
Simon Vandel Sillesen
0857405208 Oracle Java Mission Control: fix startup
The jmc binary needed some runtime dependencies. JMC can now be run.
2016-04-23 16:17:41 +02:00
taku0
713a069155 oraclejdk: 8u77 -> 8u91, 8u92 2016-04-20 23:35:49 +09:00
taku0
b8cc111764 oraclejdk: 8u73, 8u74 -> 8u77 2016-03-28 23:14:33 +09:00
taku0
ae6f06be03 oraclejdk: 8u71, 8u72 -> 8u73, 8u74 2016-02-08 09:56:23 +09:00
Rok Garbas
b19d702b65 oraclejdk: 8u65, 8u66 -> 8u71, 8u72, fixes #12498 2016-01-20 16:10:36 +01:00
Rok Garbas
4f40a45426 oraclejdk8: 8u65 -> 8u72 2016-01-20 04:42:30 +01:00
Domen Kožar
916c10138a Merge pull request #10510 from taku0/oraclejdk-8u65
oraclejdk: 8u60 -> 8u65, 8u66
2015-11-06 16:21:37 +01:00
Bob van der Linden
0c481966b6 oraclejdk: added architecture attribute
This attribute is needed by some other packages. The lack of this
attribute makes nox-review fail on a system where
jdk = oraclejdk7;
2015-10-22 20:44:45 +02:00
taku0
3f51f4c463 oraclejdk: 8u60 -> 8u65, 8u66 2015-10-21 21:12:05 +09:00
Brian McKenna
2db64534f1 oraclejdk8: Fix installation of JCE
Oracle changed the path of the files.

Previous versions looked like:

    $ jar tf UnlimitedJCEPolicyJDK7.zip
    UnlimitedJCEPolicy/
    UnlimitedJCEPolicy/US_export_policy.jar
    UnlimitedJCEPolicy/local_policy.jar
    UnlimitedJCEPolicy/README.txt

The new version looks like:

    $ jar tf jce_policy-8.zip
    UnlimitedJCEPolicyJDK8/
    UnlimitedJCEPolicyJDK8/local_policy.jar
    UnlimitedJCEPolicyJDK8/README.txt
    UnlimitedJCEPolicyJDK8/US_export_policy.jar

A better solution is probably just to trim the directory off completely.
2015-09-27 20:28:49 +10:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Vladimír Čunát
e922b6b0a2 oracle{jdk,jre}: add meta.platforms to fix #9786
It won't be built by Hydra anyway due to being unfree.
2015-09-17 20:17:12 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
taku0
ec24fc6ecc oraclejdk: 8u51 -> 8u60 2015-08-19 22:04:29 +09:00
taku0
e7fe54e80c oraclejdk: 8u45 -> 8u51 2015-07-15 09:52:03 +09:00
taku0
256cd8046c oraclejdk: bump to 8u45, 7u79, and 7u80 2015-04-15 10:02:05 +09:00
Austin Seipp
11ff78da80 nixpkgs: update oraclejdk8 sha256s
Apparently, these changed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 01:15:52 -05:00
taku0
137f281849 oraclejdk: bump to 8u40 2015-03-05 23:01:21 +09:00
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
taku0
267ea498b6 oraclejdk: bump to 8u31, 7u75, and 7u76 2015-01-23 15:44:22 +09:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
William A. Kennington III
bbc4262514 java: Add home passthru 2015-01-07 14:55:41 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
taku0
d019bcf8ec oraclejdk: bump to 8u25, 7u71, and 7u72 2014-10-28 05:24:33 -07:00