lol

Merge pull request #28780 from NeQuissimus/openjdk_8_144_01

openjdk: 8u152-04 -> 8u144-01

authored by

Tim Steinbach and committed by
GitHub
440bf7e0 2cf1b94b

+13 -12
+13 -12
pkgs/development/compilers/openjdk/8.nix
··· 21 21 else 22 22 throw "openjdk requires i686-linux or x86_64 linux"; 23 23 24 - update = "152"; 25 - build = "04"; 24 + update = "144"; 25 + build = "01"; 26 26 baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; 27 27 repover = "jdk8u${update}-b${build}"; 28 28 paxflags = if stdenv.isi686 then "msp" else "m"; 29 29 jdk8 = fetchurl { 30 30 url = "${baseurl}/archive/${repover}.tar.gz"; 31 - sha256 = "1hnpbx0v89jmbg58ym4zm255da11zf5jq8y5s58zj4x2z6b1fpxi"; 31 + sha256 = "08b7ia2ifvcl8xnpflf019ak3xcbdjnxcy1mhfp3nbfsbk2sia45"; 32 32 }; 33 33 langtools = fetchurl { 34 34 url = "${baseurl}/langtools/archive/${repover}.tar.gz"; 35 - sha256 = "060q01msfyspn14c9mkf9x0l8sprki9n8zb3cwlgglhnr2d4gfbr"; 35 + sha256 = "0g7q6ljvn79psrcak3l4imd27w047ngavn9jcn3xwivg5wppsfks"; 36 36 }; 37 37 hotspot = fetchurl { 38 38 url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; 39 - sha256 = "0705667y6llsmszvdcbhbxzbn1csv1f2rlyghwggx5xnaq46dhx6"; 39 + sha256 = "1hbbzf0m2a78dm8pyvc11jwfpj7q67pvjrp3hf0cnc38k9mzrn8q"; 40 40 }; 41 41 corba = fetchurl { 42 42 url = "${baseurl}/corba/archive/${repover}.tar.gz"; 43 - sha256 = "13f4h43lw9q1292fymn2d7whwvccpkcqraasdhvzf904101xcpsl"; 43 + sha256 = "1znc0prsb814ggm6qjgbsykm864mwypnxgi9w9f9riq8gs0578gh"; 44 44 }; 45 45 jdk = fetchurl { 46 46 url = "${baseurl}/jdk/archive/${repover}.tar.gz"; 47 - sha256 = "16wqinqv0aqyf6jg3nsn6rj5s7ggq82wvx86zm584g56011vkgf6"; 47 + sha256 = "0gx5md1v1jmqhdwcc7smpf46sgp4alvb6jz3n6yjlcyfzk92yi78"; 48 48 }; 49 49 jaxws = fetchurl { 50 50 url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; 51 - sha256 = "0japl4nyb8y3w1mpfpkxn5vkf8fap1rg340vjnb6qm6fpqvl964f"; 51 + sha256 = "0ad9w7gnwlpdssw2p3kfny02mmvzc6z8i2n7qq0177ml48c88iji"; 52 52 }; 53 53 jaxp = fetchurl { 54 54 url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; 55 - sha256 = "024zphx9r92ws9xjihvhyrbbbamfl7js0s24ff577v5z5gdb1lly"; 55 + sha256 = "14yzbbishsyrzmymws6mnndqj6hvs69ivfdbjhgwi0wl23g9siym"; 56 56 }; 57 57 nashorn = fetchurl { 58 58 url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; 59 - sha256 = "1crnbjjv1s6ndqpllcrggcpsxvqcnpr58zp51y0hjz3m3gpsxwcq"; 59 + sha256 = "175q29n4bfmm1cyyga7x58zhh6ann9rm3wibw0scrhgy23lx052x"; 60 60 }; 61 61 openjdk8 = stdenv.mkDerivation { 62 62 name = "openjdk-8u${update}b${build}"; ··· 100 100 substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" 101 101 '' 102 102 # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 103 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 103 104 + stdenv.lib.optionalString stdenv.cc.isGNU '' 104 - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks" 105 + NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" 105 106 ''; 106 107 107 108 configureFlags = [ ··· 246 247 homepage = http://openjdk.java.net/; 247 248 license = licenses.gpl2; 248 249 description = "The open-source Java Development Kit"; 249 - maintainers = with maintainers; [ edwtjo ]; 250 + maintainers = with maintainers; [ edwtjo nequissimus ]; 250 251 platforms = platforms.linux; 251 252 }; 252 253