3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

74 commits

Author SHA1 Message Date
Matthew Bauer 143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
taku0 7042807f0e oraclejdk: 10 -> 10.0.1 2018-04-19 23:42:59 +09:00
taku0 5aa3dd119f oraclejdk: 8u161, 8u162 -> 8u171, 8u172 2018-04-18 03:15:40 +09:00
Austin Seipp f71b066d60 nixpkgs: remove all Java 9 expressions
Java 9 is EOL, and we no longer need it with JDK 10 builds bootstrapped via JDK
10.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-01 15:18:47 -05:00
Matthew Justin Bauer 3884d24466
openjdk: get rid of warning
This warning breaks tarball creation:

https://hydra.nixos.org/build/71825197/nixlog/1
2018-03-23 20:43:32 -05:00
taku0 d2d859d5c5 oraclejdk: add version 10 2018-03-23 13:40:13 -05:00
Alexander V. Nikolaev 8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Tim Steinbach ca8169a6f1
Merge pull request #33979 from taku0/oraclejdk-8u161
oraclejre: 9.0.1 -> 9.0.4 [Critical security fixes]
2018-01-17 14:14:51 +00:00
taku0 41cb6636fb oraclejre: 9.0.1 -> 9.0.4 2018-01-17 23:05:28 +09:00
Tim Steinbach a74e13f057
Merge pull request #33976 from taku0/oraclejdk-8u161
oraclejdk: 8u151, 8u152, 9.0.1 -> 8u161, 8u162, 9.0.4 [Critical security fixes]
2018-01-17 13:56:52 +00:00
Tim Steinbach 1d17b481c6
Merge pull request #31552 from taku0/jdk9-remove-jce
oraclejdk: remove JCE option
2018-01-17 13:56:40 +00:00
taku0 88ba2698c3 oraclejdk: 8u151, 8u152, 9.0.1 -> 8u161, 8u162, 9.0.4 2018-01-17 19:12:21 +09:00
volth 45121d9dfc
Merge branch 'master' into oracle-jdk-remove-redundand-asserts 2017-12-13 07:02:42 +00:00
Vladimír Čunát 3a110ea3f9
treewide platform checks: abort -> throw
They aren't meant to be critical (uncatchable) errors.
Tested with nix-env + checkMeta:
[ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
2017-12-12 18:08:10 -05:00
John Doe 2394c40fc0 oraclejdk8: fix armv7l hashes 2017-12-07 06:44:44 +00:00
John Doe 683337d5f5 oraclejdk: remove redundant asserts 2017-12-06 07:43:22 +00:00
John Doe f38560a17b oraclejdk8: support aarch64
[dezgeg amended the change to all-packages.nix]
2017-12-05 15:48:25 +02: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
taku0 194fed059d oraclejdk: remove JCE option
The unlimited JCE is bundled by default with Oracle JDK 9.
http://www.oracle.com/technetwork/java/javase/terms/readme/jdk9-readme-3852447.html
2017-11-12 15:02:35 +09: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