Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1504e6942019
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1d17b481c6d8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 12, 2017

  1. 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
    @taku0
    taku0 committed Nov 12, 2017
    Copy the full SHA
    194fed0 View commit details

Commits on Jan 17, 2018

  1. Merge pull request #31552 from taku0/jdk9-remove-jce 

    oraclejdk: remove JCE option
    @NeQuissimus
    NeQuissimus authored Jan 17, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Zuoqiu-Yingyi Yingyi / 颖逸
    GPG key ID: 833DAD5428FF18A8
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1d17b48 View commit details
Showing with 1 addition and 18 deletions.
  1. +1 −18 pkgs/development/compilers/oraclejdk/jdk9-linux.nix
19 changes: 1 addition & 18 deletions pkgs/development/compilers/oraclejdk/jdk9-linux.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
, xorg ? null
, packageType ? "JDK" # JDK, JRE, or ServerJRE
, pluginSupport ? true
, installjce ? false
, glib
, libxml2
, ffmpeg_2
@@ -34,16 +33,6 @@ let

downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;

jce =
if installjce then
requireFile {
name = "jce_policy-8.zip";
url = "${downloadUrlBase}/jce8-download-2133166.html";
sha256 = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
}
else
"";

rSubPaths = [
"lib/jli"
"lib/server"
@@ -79,8 +68,7 @@ let result = stdenv.mkDerivation rec {
}
else abort "unknown package Type ${packageType}";

nativeBuildInputs = [ file ]
++ stdenv.lib.optional installjce unzip;
nativeBuildInputs = [ file ];

buildInputs = [ makeWrapper ];

@@ -108,11 +96,6 @@ let result = stdenv.mkDerivation rec {
fi
done
if test -n "${jce}"; then
unzip ${jce}
cp -v UnlimitedJCEPolicy*/*.jar $out/lib/security
fi
if test -z "$pluginSupport"; then
rm -f $out/bin/javaws
fi