Merge pull request #235774 from NickCao/geoip

dbip-country-lite: init at 2023-06

authored by

Nick Cao and committed by
GitHub
f47f0a52 8cb8cac8

+46 -6
+36
pkgs/data/misc/dbip-country-lite/default.nix
··· 1 + { lib 2 + , stdenvNoCC 3 + , fetchurl 4 + , dbip-country-lite 5 + }: 6 + 7 + stdenvNoCC.mkDerivation rec { 8 + pname = "dbip-country-lite"; 9 + version = "2023-06"; 10 + 11 + src = fetchurl { 12 + url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz"; 13 + hash = "sha256-H+f7OhI03qhgpldF05Nc5ohPIPNhyVRCwiVqeWkvIbc="; 14 + }; 15 + 16 + dontUnpack = true; 17 + 18 + installPhase = '' 19 + runHook preBuild 20 + 21 + gzip -c -d "$src" > dbip-country-lite.mmdb 22 + install -Dm444 dbip-country-lite.mmdb "$out/share/dbip/dbip-country-lite.mmdb" 23 + 24 + runHook postBuild 25 + ''; 26 + 27 + passthru.mmdb = "${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb"; 28 + 29 + meta = with lib; { 30 + description = "The free IP to Country Lite database by DB-IP"; 31 + homepage = "https://db-ip.com/db/download/ip-to-country-lite"; 32 + license = licenses.cc-by-40; 33 + maintainers = with maintainers; [ nickcao ]; 34 + platforms = platforms.all; 35 + }; 36 + }
+5 -5
pkgs/data/misc/sing-geoip/default.nix
··· 2 2 , stdenvNoCC 3 3 , buildGoModule 4 4 , fetchFromGitHub 5 - , clash-geoip 5 + , dbip-country-lite 6 6 }: 7 7 8 8 let ··· 34 34 in 35 35 stdenvNoCC.mkDerivation rec { 36 36 inherit (generator) pname; 37 - inherit (clash-geoip) version; 37 + inherit (dbip-country-lite) version; 38 38 39 39 dontUnpack = true; 40 40 ··· 43 43 buildPhase = '' 44 44 runHook preBuild 45 45 46 - ${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip.db 47 - ${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip-cn.db cn 46 + ${pname} ${dbip-country-lite.mmdb} geoip.db 47 + ${pname} ${dbip-country-lite.mmdb} geoip-cn.db cn 48 48 49 49 runHook postBuild 50 50 ''; ··· 61 61 passthru = { inherit generator; }; 62 62 63 63 meta = generator.meta // { 64 - inherit (clash-geoip.meta) license; 64 + inherit (dbip-country-lite.meta) license; 65 65 }; 66 66 }
+5 -1
pkgs/top-level/all-packages.nix
··· 519 519 520 520 databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; 521 521 522 + dbip-country-lite = callPackage ../data/misc/dbip-country-lite { }; 523 + 522 524 dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; 523 525 524 526 dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { }; ··· 12442 12444 12443 12445 sing-geosite = callPackage ../data/misc/sing-geosite { }; 12444 12446 12445 - sing-geoip = callPackage ../data/misc/sing-geoip { }; 12447 + sing-geoip = callPackage ../data/misc/sing-geoip { 12448 + buildGoModule = buildGo119Module; 12449 + }; 12446 12450 12447 12451 sipcalc = callPackage ../tools/networking/sipcalc { }; 12448 12452