colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121500 from servalcatty/v2ray

Browse Source 
v2ray: 4.37.3 -> 4.38.3
This commit is contained in:
Sandro 2021-05-17 19:18:56 +02:00 committed by GitHub
commit 4fc08dd955
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/v2ray.nix
View File

@ -3,7 +3,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let
v2rayUser = { v2rayUser = {
# A random UUID. # A random UUID.
id = "a6a46834-2150-45f8-8364-0f6f6ab32384"; id = "a6a46834-2150-45f8-8364-0f6f6ab32384";
alterId = 4; alterId = 0; # Non-zero support will be disabled in the future.
}; };
# 1080 [http proxy] -> 1081 [vmess] -> direct # 1080 [http proxy] -> 1081 [vmess] -> direct

14
pkgs/tools/networking/v2ray/default.nix
View File

@ -3,22 +3,22 @@
}: }:
let let
version = "4.37.3"; version = "4.38.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "v2ray-core"; repo = "v2ray-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "0gbkjlrx4ddaxb5f21m3sxbb55ilvm5kqlrys6ckrx0xyz9hj38y"; sha256 = "1vsq98h6zbm3wz1mgphl7dqlabgfg53fhkyn47vfbhhkbx6nwl7c";
}; };
vendorSha256 = "sha256-hPzIAXImAEJux1VRqCgslgn8giTf9BgZBcEZyF4Ut9Y="; vendorSha256 = "sha256-jXpGlJ30xBttysbUekMdw8fH0KVfPufWq0t7AXZrDEQ=";
assets = { assets = {
# MIT licensed # MIT licensed
"geoip.dat" = let "geoip.dat" = let
geoipRev = "202104150006"; geoipRev = "202104300531";
geoipSha256 = "0ppm5r4bycjm7q0vnxj62q8639kp06sfkkkrkk5gibyrwisr4vrp"; geoipSha256 = "0srskpp0pmw4fzp4lgachjjvig4fy96523r7aj2bwig0ipfgr401";
in fetchurl { in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256; sha256 = geoipSha256;
@ -26,8 +26,8 @@ let
# MIT licensed # MIT licensed
"geosite.dat" = let "geosite.dat" = let
geositeRev = "20210415054336"; geositeRev = "20210430100800";
geositeSha256 = "0vs9fjbw45ipi7minh0r8zgh3pbwxqlrhwahpwyc6s0hyxgdi40w"; geositeSha256 = "0wp111iip3lhkgpbrzzivl5flj44vj7slx9w7k307sls6hmjzlcb";
in fetchurl { in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256; sha256 = geositeSha256;