Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III
2015-10-15 10:22:28 -07:00
433 changed files with 31372 additions and 6980 deletions

View File

@@ -8,29 +8,29 @@ let
# Annoyingly, these files are updated without a change in URL. This means that
# builds will start failing every month or so, until the hashes are updated.
version = "2015-09-29";
version = "2015-10-13";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
"11xv6ws0gzyj9bf1j1g67cklkkl6s4wb6z6n7kxjcxnn2274nfy0";
"066j1mnpzfyd5cp0knvg13v01fdvgv32ggvab0xwyh1pa0c14dv4";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
"1q5vgk522wq5ybhbw86zk8njgg611kc46a22vkrp08vklbni3akz";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
"07hx9g6kif75icsblcdk64rq13w2knpns4lrxdbf63mmqbqxj29g";
"09w7vs13xzji574bykggh8cph992zc4yajvhjh4qrvwrxjmjilw3";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
"0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9";
"0jdgfcy90mk7q25rhb8ymnddkskmp2cmyzmbjr3ij0zvbbpzxl4i";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"1b8rk3crnm94ndlkw99h7iyn9daznf7sirck1zs80ppg7c69gknp";
"0j73lw2i6nnx1mgp1hspfa95zca5h0hqj12g16rln7pss868wnwi";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
"06hwj3ksfz4ikh84cqcdl1xi4rkrc9cz26h31vg9w5awx5kbbc10";
"1id4rkxp5pppr274y276w2zmx44dn0h44d4ax780g8cbhlc9n2br";
meta = with stdenv.lib; {
inherit version;