diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-06-03 10:43:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-03 10:43:57 -0600 |
| commit | f47f0a525cac079318e62fef27439f17afa18e7a (patch) | |
| tree | 7be51f83310c4e329d0fb7f261120fc8a7168f60 | |
| parent | Merge pull request #235509 from figsoda/ov (diff) | |
| parent | sing-geoip: use dbip-country-lite instead of unfree clash-geoip (diff) | |
| download | nixpkgs-f47f0a525cac079318e62fef27439f17afa18e7a.tar.gz | |
Merge pull request #235774 from NickCao/geoip
dbip-country-lite: init at 2023-06
| -rw-r--r-- | pkgs/data/misc/dbip-country-lite/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/data/misc/sing-geoip/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 46 insertions, 6 deletions
diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix new file mode 100644 index 000000000000..ffa2ec24974b --- /dev/null +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchurl +, dbip-country-lite +}: + +stdenvNoCC.mkDerivation rec { + pname = "dbip-country-lite"; + version = "2023-06"; + + src = fetchurl { + url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz"; + hash = "sha256-H+f7OhI03qhgpldF05Nc5ohPIPNhyVRCwiVqeWkvIbc="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preBuild + + gzip -c -d "$src" > dbip-country-lite.mmdb + install -Dm444 dbip-country-lite.mmdb "$out/share/dbip/dbip-country-lite.mmdb" + + runHook postBuild + ''; + + passthru.mmdb = "${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb"; + + meta = with lib; { + description = "The free IP to Country Lite database by DB-IP"; + homepage = "https://db-ip.com/db/download/ip-to-country-lite"; + license = licenses.cc-by-40; + maintainers = with maintainers; [ nickcao ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/sing-geoip/default.nix b/pkgs/data/misc/sing-geoip/default.nix index e8ea5ddd4428..91c485ce1154 100644 --- a/pkgs/data/misc/sing-geoip/default.nix +++ b/pkgs/data/misc/sing-geoip/default.nix @@ -2,7 +2,7 @@ , stdenvNoCC , buildGoModule , fetchFromGitHub -, clash-geoip +, dbip-country-lite }: let @@ -34,7 +34,7 @@ let in stdenvNoCC.mkDerivation rec { inherit (generator) pname; - inherit (clash-geoip) version; + inherit (dbip-country-lite) version; dontUnpack = true; @@ -43,8 +43,8 @@ stdenvNoCC.mkDerivation rec { buildPhase = '' runHook preBuild - ${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip.db - ${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip-cn.db cn + ${pname} ${dbip-country-lite.mmdb} geoip.db + ${pname} ${dbip-country-lite.mmdb} geoip-cn.db cn runHook postBuild ''; @@ -61,6 +61,6 @@ stdenvNoCC.mkDerivation rec { passthru = { inherit generator; }; meta = generator.meta // { - inherit (clash-geoip.meta) license; + inherit (dbip-country-lite.meta) license; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0662afea1753..1adcf10de7a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -519,6 +519,8 @@ with pkgs; databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; + dbip-country-lite = callPackage ../data/misc/dbip-country-lite { }; + dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { }; @@ -12442,7 +12444,9 @@ with pkgs; sing-geosite = callPackage ../data/misc/sing-geosite { }; - sing-geoip = callPackage ../data/misc/sing-geoip { }; + sing-geoip = callPackage ../data/misc/sing-geoip { + buildGoModule = buildGo119Module; + }; sipcalc = callPackage ../tools/networking/sipcalc { }; |