pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #14851 from taku0/oraclejdk-8u91

oraclejdk: 8u77 -> 8u91, 8u92

Joachim Fasting 1636d180 e6899cc8

+8 -12
unified split
+2 -6
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
··· 119 done 120 fi 121 122 - # construct the rpath 123 - rpath= 124 - for i in $libraries; do 125 - rpath=$rpath''${rpath:+:}$i/lib:$i/lib64 126 - done 127 - 128 if test -z "$installjdk"; then 129 jrePath=$out 130 else ··· 175 libraries = 176 [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ 177 (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); 178 179 passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; 180
··· 119 done 120 fi 121 122 if test -z "$installjdk"; then 123 jrePath=$out 124 else ··· 169 libraries = 170 [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ 171 (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); 172 + 173 + rpath = stdenv.lib.strings.makeLibraryPath libraries; 174 175 passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; 176
+3 -3
pkgs/development/compilers/oraclejdk/jdk8-linux.nix
··· 1 import ./jdk-linux-base.nix { 2 productVersion = "8"; 3 - patchVersion = "77"; 4 downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; 5 - sha256_i686 = "14hyniai5l9qpg0pbnxa4rhyhk90qgihszfkn8h3vziqhmvrp27j"; 6 - sha256_x86_64 = "0hyzvvj4bf0r4jda8fv3k06d9bf37nji37qbq067mcjp5abc0zd4"; 7 jceName = "jce_policy-8.zip"; 8 jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; 9 sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
··· 1 import ./jdk-linux-base.nix { 2 productVersion = "8"; 3 + patchVersion = "91"; 4 downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; 5 + sha256_i686 = "0lndni81vfpz2l6zb8zsshaavk0483q5jc8yzj4fdjv6wnshbkay"; 6 + sha256_x86_64 = "0lkm3fz1vdi69f34sysavvh3abx603j1frc9hxvr08pwvmm536vg"; 7 jceName = "jce_policy-8.zip"; 8 jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; 9 sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
+3 -3
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
··· 1 import ./jdk-linux-base.nix { 2 productVersion = "8"; 3 - patchVersion = "77"; 4 downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; 5 - sha256_i686 = "14hyniai5l9qpg0pbnxa4rhyhk90qgihszfkn8h3vziqhmvrp27j"; 6 - sha256_x86_64 = "0hyzvvj4bf0r4jda8fv3k06d9bf37nji37qbq067mcjp5abc0zd4"; 7 jceName = "jce_policy-8.zip"; 8 jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; 9 sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
··· 1 import ./jdk-linux-base.nix { 2 productVersion = "8"; 3 + patchVersion = "92"; 4 downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; 5 + sha256_i686 = "095j2hh2xas05jajy4qdj9hxq3k460x4m12rcaxkaxw754imj0vj"; 6 + sha256_x86_64 = "11wrqd3qbkhimbw9n4g9i0635pjhhnijwxyid7lvjv26kdgg58vr"; 7 jceName = "jce_policy-8.zip"; 8 jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; 9 sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";