diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-04 00:15:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-04 00:15:50 +0000 |
| commit | 0e5a0abb85462f9cdc5b971416bf3663150355f1 (patch) | |
| tree | ecdc4e7f73a5f9380bf985853dba56bd938e4f3a /pkgs/data/misc | |
| parent | 59d55eab4c36efcf20b4586c3cfe2b4df212d2da (diff) | |
| parent | dd4982554e18b936790da07c4ea2db7c7600f283 (diff) | |
| download | nixpkgs-0e5a0abb85462f9cdc5b971416bf3663150355f1.tar nixpkgs-0e5a0abb85462f9cdc5b971416bf3663150355f1.tar.gz nixpkgs-0e5a0abb85462f9cdc5b971416bf3663150355f1.tar.bz2 nixpkgs-0e5a0abb85462f9cdc5b971416bf3663150355f1.tar.lz nixpkgs-0e5a0abb85462f9cdc5b971416bf3663150355f1.tar.xz nixpkgs-0e5a0abb85462f9cdc5b971416bf3663150355f1.tar.zst nixpkgs-0e5a0abb85462f9cdc5b971416bf3663150355f1.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/dbip-country-lite/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/data/misc/sing-geoip/default.nix | 10 |
2 files changed, 41 insertions, 5 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 00000000000..ffa2ec24974 --- /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 e8ea5ddd442..91c485ce115 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; }; } |