Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #43842 from srhb/jdk-backport

Backport of #43811 jdk updates (help needed)

authored by Andreas Rammhold and committed by GitHub bfa517dc 54a20762

+4 -4
+4 -4
pkgs/development/compilers/oraclejdk/jdk10-linux.nix
··· 29 assert swingSupport -> xorg != null; 30 31 let 32 - version = "10.0.1"; 33 34 downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; 35 ··· 52 requireFile { 53 name = "jdk-${version}_linux-x64_bin.tar.gz"; 54 url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; 55 - sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf"; 56 } 57 else if packageType == "JRE" then 58 requireFile { 59 name = "jre-${version}_linux-x64_bin.tar.gz"; 60 url = "${downloadUrlBase}/jre10-downloads-4417026.html"; 61 - sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq"; 62 } 63 else if packageType == "ServerJRE" then 64 requireFile { 65 name = "serverjre-${version}_linux-x64_bin.tar.gz"; 66 url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; 67 - sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw"; 68 } 69 else abort "unknown package Type ${packageType}"; 70
··· 29 assert swingSupport -> xorg != null; 30 31 let 32 + version = "10.0.2"; 33 34 downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; 35 ··· 52 requireFile { 53 name = "jdk-${version}_linux-x64_bin.tar.gz"; 54 url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; 55 + sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6"; 56 } 57 else if packageType == "JRE" then 58 requireFile { 59 name = "jre-${version}_linux-x64_bin.tar.gz"; 60 url = "${downloadUrlBase}/jre10-downloads-4417026.html"; 61 + sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx"; 62 } 63 else if packageType == "ServerJRE" then 64 requireFile { 65 name = "serverjre-${version}_linux-x64_bin.tar.gz"; 66 url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; 67 + sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c"; 68 } 69 else abort "unknown package Type ${packageType}"; 70