Commit graph

25 commits

Author SHA1 Message Date
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
Aristid Breitkreuz
3e707fe5db update oracle jdk 7 2014-10-22 20:46:44 +02:00
taku0
7175fdcd71 oraclejdk: bump to 8u20
Closes #4492
2014-10-12 15:43:44 +01:00
Paul Koerbitz
b8a88ce472 Update oraclejdk-7 patch version from 65 to 67 2014-09-03 21:30:31 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
taku0
c986350bfd oraclejdk: bump to 8u11 2014-07-17 10:19:51 +09:00
Eelco Dolstra
94db68d283 Move jdk -> oraclejdk 2014-07-16 18:35:35 +02:00