Merge pull request #236019 from NickCao/sing-geoip

sing-geoip.generator: unstable-2022-07-05 -> 20230512
This commit is contained in:
Nick Cao 2023-06-05 01:14:56 -06:00 committed by GitHub
commit fea54c6aff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 12 deletions

View file

@ -8,21 +8,16 @@
let
generator = buildGoModule rec {
pname = "sing-geoip";
version = "unstable-2022-07-05";
version = "20230512";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "2ced72c94da4c9259c40353c375319d9d28a78f3";
hash = "sha256-z8aP+OfTuzQNwOT3EEnI9uze/vbHTJLEiCPqIrnNUHw=";
rev = "refs/tags/${version}";
hash = "sha256-Zm+5N/37hoHpH/TLNJrHeaBXI8G1jEpM1jz6Um8edNE=";
};
vendorHash = "sha256-lr0XMLFxJmLqIqCuGgmsFh324jmZVj71blmStMn41Rs=";
postPatch = ''
# The codes args should start from the third args
substituteInPlace main.go --replace "os.Args[2:]" "os.Args[3:]"
'';
vendorHash = "sha256-ejXAdsJwXhqet+Ca+pDLWwu0gex79VcIxW6rmhRnbTQ=";
meta = with lib; {
description = "GeoIP data for sing-box";

View file

@ -12454,9 +12454,7 @@ with pkgs;
sing-geosite = callPackage ../data/misc/sing-geosite { };
sing-geoip = callPackage ../data/misc/sing-geoip {
buildGoModule = buildGo119Module;
};
sing-geoip = callPackage ../data/misc/sing-geoip { };
sipcalc = callPackage ../tools/networking/sipcalc { };