diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-18 21:54:00 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-18 21:55:41 +0200 |
| commit | c7ed26b6a961059c82b679961806ecf5403a308e (patch) | |
| tree | a05bb6a65e3b4567febdd337aeccd9a72838ff4a /pkgs/data/misc | |
| parent | ad13618c9be274e44dc40f4a27979db6243b5ec0 (diff) | |
| download | nixlib-c7ed26b6a961059c82b679961806ecf5403a308e.tar nixlib-c7ed26b6a961059c82b679961806ecf5403a308e.tar.gz nixlib-c7ed26b6a961059c82b679961806ecf5403a308e.tar.bz2 nixlib-c7ed26b6a961059c82b679961806ecf5403a308e.tar.lz nixlib-c7ed26b6a961059c82b679961806ecf5403a308e.tar.xz nixlib-c7ed26b6a961059c82b679961806ecf5403a308e.tar.zst nixlib-c7ed26b6a961059c82b679961806ecf5403a308e.zip | |
geolite-legacy: 2017-05-26 -> 2017-09-17
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/geolite-legacy/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/geolite-legacy/default.nix | 24 |
2 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh index bf8c9812e924..c3e09e8543c5 100644 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ b/pkgs/data/misc/geolite-legacy/builder.sh @@ -17,4 +17,6 @@ for var in "${!src@}"; do done gzip -dv *.gz -xz -dv *.xz + +ln -s GeoLiteCity.dat GeoIPCity.dat +ln -s GeoLiteCityv6.dat GeoIPCityv6.dat diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 282a0dd1596a..0522de227aa4 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -1,32 +1,32 @@ { stdenv, fetchurl }: let - fetchDB = src: name: sha256: fetchurl { - inherit name sha256; + fetchDB = src: sha256: fetchurl { + inherit sha256; url = "https://geolite.maxmind.com/download/geoip/database/${src}"; }; in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2017-05-26"; + version = "2017-09-17"; srcGeoIP = fetchDB - "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" + "GeoLiteCountry/GeoIP.dat.gz" "04akk0jczvki8rdvz6z6v5s26ds0m27953lzvp3v0fsg7rl08q5n"; srcGeoIPv6 = fetchDB - "GeoIPv6.dat.gz" "GeoIPv6.dat.gz" + "GeoIPv6.dat.gz" "0i0885vvj0s5sysyafvk8pc8gr3znh7gmiy8rp4iiai7qnbylb7y"; srcGeoLiteCity = fetchDB - "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz" - "0bgf4kfg4mmqvgmrff27lbiglnnb3pnd7f3i4fxzl68c33bizmbm"; + "GeoLiteCity.dat.gz" + "1yqxqfndnsvqc3hrs0nm6nvs0wp8jh9phs0yzrn48rlb9agcb8gj"; srcGeoLiteCityv6 = fetchDB - "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz" - "06slyw2644y2z5bgn4yl79aa4smf94mdcddybldh1glc3ay3p4iz"; + "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" + "05grm006r723l9zm7pdmwwycc658ni858hcrcf5mysv0hmc3wqb2"; srcGeoIPASNum = fetchDB - "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" + "asnum/GeoIPASNum.dat.gz" "1gpvsqvq9z9pg9zfn86i50fb481llfyn79r1jwddwfflp1qqfrrv"; srcGeoIPASNumv6 = fetchDB - "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" + "asnum/GeoIPASNumv6.dat.gz" "0nmhz82dn9clm5w2y6z861ifj7i761spy1p1zcam93046cdpqqaa"; meta = with stdenv.lib; { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = https://geolite.maxmind.com/download/geoip; license = licenses.cc-by-sa-30; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx fpletz ]; }; builder = ./builder.sh; |