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

Merge master into closure-size

Browse Source 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
This commit is contained in:
Vladimír Čunát
2016-03-08 09:57:58 +01:00
parent f306e67e15 0ee75214f3
commit 09af15654f
1276 changed files with 78548 additions and 29166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/data/misc/geolite-legacy/default.nix
View File

@@ -8,7 +8,7 @@ let
in
stdenv.mkDerivation rec {
name = "geolite-legacy-${version}";
version = "2016-02-08";
version = "2016-02-29";
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
"0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"0ib93p2fwayqsxwph98rkgln7xpjrwhzzc06sc74876jpaq3g8g5";
"10i4c8irvh9shbl3y0s0ffkm71vf3r290fvxjx20snqa558hkvib";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
"1izlxqcvdag66sny5zjjwkmjhai0c9m77b96j117n0x0awrrk4h9";
"1rvbjrj98pqj9w5ql5j49b3h40496g6aralpnz1gj21v6dfrd55n";
meta = with stdenv.lib; {
description = "GeoLite Legacy IP geolocation databases";