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: 2b7efda1a73a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f8dc56ec0513
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 17, 2018

  1. oraclejre: 9.0.1 -> 9.0.4 

    (cherry picked from commit 41cb663)
    @taku0 @NeQuissimus
    taku0 authored and NeQuissimus committed Jan 17, 2018
    Copy the full SHA
    27d4cc4 View commit details

  2. 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

(cherry picked from commit 194fed0)
    @taku0 @NeQuissimus
    taku0 authored and NeQuissimus committed Jan 17, 2018
    Copy the full SHA
    f8dc56e View commit details
Showing with 3 additions and 20 deletions.
  1. +3 −20 pkgs/development/compilers/oraclejdk/jdk9-linux.nix
23 changes: 3 additions & 20 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"
@@ -69,18 +58,17 @@ let result = stdenv.mkDerivation rec {
requireFile {
name = "jre-${version}_linux-x64_bin.tar.gz";
url = "${downloadUrlBase}/jre9-downloads-3848532.html";
sha256 = "11pfcck8am48yv7riaj10g6h79xdiy8lm5a9wjqbm3g9cls9ar1w";
sha256 = "01fp079mr04nniyf06w8vd47qxr6rly1lbh8dqkddb8fp9h6a79k";
}
else if packageType == "ServerJRE" then
requireFile {
name = "serverjre-${version}_linux-x64_bin.tar.gz";
url = "${downloadUrlBase}/server-jre9-downloads-3848530.html";
sha256 = "1biyks6jy0a2kksaj9qbsjifv34ym5mdw8akibmkwr1xh0wavygc";
sha256 = "1jlpa4mn306hx0p9jcw3i6cpdvnng29dwjsymgcan56810q6p6yj";
}
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