JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icedtea: 2.5.4 -> 2.5.5

Browse Source
This commit is contained in:
William A. Kennington III 2015-04-17 13:56:44 -07:00
parent 96ea5d3c56
commit 556c2a919c
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/icedtea/currency-date-range.patch
View File

@ -1,14 +0,0 @@
diff -Naur openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
+++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-12-30 10:15:50.327905933 -0430
@@ -281,8 +281,8 @@
checkCurrencyCode(newCurrency);
String timeString = currencyInfo.substring(4, length - 4);
long time = format.parse(timeString).getTime();
- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
- throw new RuntimeException("time is more than 10 years from present: " + time);
+ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
+ throw new RuntimeException("time is more than 20 years from present: " + time);
}
specialCaseCutOverTimes[specialCaseCount] = time;
specialCaseOldCurrencies[specialCaseCount] = oldCurrency;

1
pkgs/development/compilers/icedtea/default.nix
View File

@ -78,7 +78,6 @@ let
patch -p0 < ${./cppflags-include-fix.patch} patch -p0 < ${./cppflags-include-fix.patch}
patch -p0 < ${./fix-java-home.patch} patch -p0 < ${./fix-java-home.patch}
patch -p0 < ${./currency-date-range.patch}
''; '';
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;

18
pkgs/development/compilers/icedtea/sources.nix
View File

@ -1,47 +1,47 @@
# This file is autogenerated from update.py in the same directory. # This file is autogenerated from update.py in the same directory.
{ {
icedtea7 = rec { icedtea7 = rec {
version = "2.5.4"; version = "2.5.5";
url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz"; url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz";
sha256 = "1npz2p11i4xy4732rxs8wv209iap0m3m24w3vkh9kj0p4k2gal0v"; sha256 = "1irxk2ndwsfk4c1zbzb5h3rpwv2bc9bhfjvz6p4dws5476vsxrq9";
common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}"; common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}";
bundles = { bundles = {
openjdk = rec { openjdk = rec {
url = "${common_url}/openjdk.tar.bz2"; url = "${common_url}/openjdk.tar.bz2";
sha256 = "88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1"; sha256 = "5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d";
}; };
corba = rec { corba = rec {
url = "${common_url}/corba.tar.bz2"; url = "${common_url}/corba.tar.bz2";
sha256 = "7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b"; sha256 = "f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51";
}; };
jaxp = rec { jaxp = rec {
url = "${common_url}/jaxp.tar.bz2"; url = "${common_url}/jaxp.tar.bz2";
sha256 = "84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3"; sha256 = "293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256";
}; };
jaxws = rec { jaxws = rec {
url = "${common_url}/jaxws.tar.bz2"; url = "${common_url}/jaxws.tar.bz2";
sha256 = "4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b"; sha256 = "76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be";
}; };
jdk = rec { jdk = rec {
url = "${common_url}/jdk.tar.bz2"; url = "${common_url}/jdk.tar.bz2";
sha256 = "e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09"; sha256 = "c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483";
}; };
langtools = rec { langtools = rec {
url = "${common_url}/langtools.tar.bz2"; url = "${common_url}/langtools.tar.bz2";
sha256 = "4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a"; sha256 = "71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660";
}; };
hotspot = rec { hotspot = rec {
url = "${common_url}/hotspot.tar.bz2"; url = "${common_url}/hotspot.tar.bz2";
sha256 = "4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34"; sha256 = "d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb";
}; };
}; };
}; };