diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/data/misc/geolite-legacy/default.nix | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/data/misc/geolite-legacy/default.nix')
| -rw-r--r-- | pkgs/data/misc/geolite-legacy/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 581d1db5088b..eab577888d11 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -5,13 +5,10 @@ let inherit name sha256; url = "https://geolite.maxmind.com/download/geoip/database/${src}"; }; - - # 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 = "2016-01-11"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; + version = "2016-01-25"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" @@ -27,13 +24,12 @@ stdenv.mkDerivation { "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "06lhgkycyxisnvcrcdqcxlbhawyqw302yv1p3836bm0fjhyr7v4r"; + "1n7zlmnaxvjljyih9yi9hns530by21h42j2kcszbcyvn7rd9rnyw"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "1scn63zd8di5jzxx4nfic4ggfy4jas9l56h0mcyvgypzlyvxgz43"; + "1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56"; meta = with stdenv.lib; { - inherit version; description = "GeoLite Legacy IP geolocation databases"; homepage = https://geolite.maxmind.com/download/geoip; license = licenses.cc-by-sa-30; |