Merge pull request #236019 from NickCao/sing-geoip

sing-geoip.generator: unstable-2022-07-05 -> 20230512

authored by

Nick Cao and committed by
GitHub
fea54c6a 38a87178

+5 -12
+4 -9
pkgs/data/misc/sing-geoip/default.nix
··· 8 8 let 9 9 generator = buildGoModule rec { 10 10 pname = "sing-geoip"; 11 - version = "unstable-2022-07-05"; 11 + version = "20230512"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "SagerNet"; 15 15 repo = pname; 16 - rev = "2ced72c94da4c9259c40353c375319d9d28a78f3"; 17 - hash = "sha256-z8aP+OfTuzQNwOT3EEnI9uze/vbHTJLEiCPqIrnNUHw="; 16 + rev = "refs/tags/${version}"; 17 + hash = "sha256-Zm+5N/37hoHpH/TLNJrHeaBXI8G1jEpM1jz6Um8edNE="; 18 18 }; 19 19 20 - vendorHash = "sha256-lr0XMLFxJmLqIqCuGgmsFh324jmZVj71blmStMn41Rs="; 21 - 22 - postPatch = '' 23 - # The codes args should start from the third args 24 - substituteInPlace main.go --replace "os.Args[2:]" "os.Args[3:]" 25 - ''; 20 + vendorHash = "sha256-ejXAdsJwXhqet+Ca+pDLWwu0gex79VcIxW6rmhRnbTQ="; 26 21 27 22 meta = with lib; { 28 23 description = "GeoIP data for sing-box";
+1 -3
pkgs/top-level/all-packages.nix
··· 12454 12454 12455 12455 sing-geosite = callPackage ../data/misc/sing-geosite { }; 12456 12456 12457 - sing-geoip = callPackage ../data/misc/sing-geoip { 12458 - buildGoModule = buildGo119Module; 12459 - }; 12457 + sing-geoip = callPackage ../data/misc/sing-geoip { }; 12460 12458 12461 12459 sipcalc = callPackage ../tools/networking/sipcalc { }; 12462 12460