diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-06-03 22:45:09 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2023-06-03 23:11:04 +0800 |
| commit | 3c7688a81400685ec507fcaba4579b5017c0a7ec (patch) | |
| tree | 59d291f95d6b5ce7df11cf318604f1cc0f589ec6 | |
| parent | dbip-country-lite: init at 2023-06 (diff) | |
| download | nixpkgs-3c7688a81400685ec507fcaba4579b5017c0a7ec.tar.gz | |
sing-geoip: use dbip-country-lite instead of unfree clash-geoip
| -rw-r--r-- | pkgs/data/misc/sing-geoip/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 6 deletions
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 3d50814d8eb3..ecdeffeb77d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12442,7 +12442,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 { }; |