b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #235774 from NickCao/geoip

Browse source 
dbip-country-lite: init at 2023-06
This commit is contained in:
Nick Cao 2023-06-03 10:43:57 -06:00 committed by GitHub
parent 8cb8cac87b 3c7688a814
commit f47f0a525c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pkgs/data/misc/dbip-country-lite/default.nix Normal file
View file

@ -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;
};
}

10
pkgs/data/misc/sing-geoip/default.nix
View file

@ -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;
};
}

6
pkgs/top-level/all-packages.nix
View file

@ -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 { };