Merge master into staging-next

This commit is contained in:
github-actions[bot]
2022-10-06 18:03:10 +00:00
committed by GitHub
45 changed files with 692 additions and 210 deletions

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202209290111";
version = "202210060105";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "1aa11a6dd94b708175a81b12037486459fa090a8";
sha256 = "sha256-CVze/QyoBKZmd+U8bfjxr+u8W95W+fs9+mAdPgyIpg4=";
rev = "0bb2420d643555aa19b21f3c06b517a7c14826b6";
sha256 = "sha256-5vr7iO2vny9yalJblBVgNwupEQ9w3LZXM+VKb4xSVD0=";
};
installPhase = ''