merge latest changes from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32270
This commit is contained in:
Peter Simons
2012-02-14 13:47:27 +00:00
parent f7886ac78b
commit 02eaa57b56
4 changed files with 9 additions and 9 deletions

View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, jdk, unzip}:
stdenv.mkDerivation {
name = "GeoIPJava-1.2.3";
name = "GeoIPJava-1.2.5";
src = fetchurl {
url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.3.zip;
sha256 = "0l8vxan2xh0mp1vjxh39q05jyfw8gk5y77b7i8s1aw7ssyzd05vs";
url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip;
sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
};
buildInputs = [ jdk unzip ];
buildPhase =