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

Merge pull request #115437 from servalcatty/v2ray

Browse Source 
v2ray: 4.34.0 -> 4.35.1
This commit is contained in:
Sandro 2021-03-08 21:15:55 +01:00 committed by GitHub
commit c0a737e8be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,22 +3,22 @@
}:
let
version = "4.34.0";
version = "4.35.1";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
sha256 = "0x6smffpvnrk76plnsk31qqznkyz06dh4sazncp2l3y9va8k2jb1";
sha256 = "07fih1hnnv1a4aj6sb63408vqf10bgk74lhqqv63lvm7gaz73srd";
};
vendorSha256 = "077jnjsmhzr0idrk7pifr5s2r9yjf1v9bvj177n2k2ln8w3wgx3g";
vendorSha256 = "sha256-+kI9p0lu4PbLe6jhWqTfRYXHFOOrKmY36LzdcQT9BWw=";
assets = {
# MIT licensed
"geoip.dat" = let
geoipRev = "202101070033";
geoipSha256 = "11naj51pzchdrjmkp1dqzcby1i2fhbq0mncwm4d5q5mh3chyizsf";
geoipRev = "202103080146";
geoipSha256 = "1qwmz5fxqqxcjw5jm9dvgpmbin2q69j9wdx4xv3pm8fc47wzx8w5";
in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
@ -26,8 +26,8 @@ let
# MIT licensed
"geosite.dat" = let
geositeRev = "20210106164413";
geositeSha256 = "0chc7jb3yzgrrjkpd3s1rlim5qgf6j2kp952fvkhpwmnap86aip7";
geositeRev = "20210308021214";
geositeSha256 = "1fp787wlzdjn2gxx4zmqrqqzqcq4xd10pqx8q919fag0kkzdm23s";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;
@ -68,7 +68,7 @@ let
};
in runCommand "v2ray-${version}" {
inherit version;
inherit src version;
inherit (core) meta;
nativeBuildInputs = [ makeWrapper ];

2
pkgs/tools/networking/v2ray/update.sh
View File

@ -61,7 +61,7 @@ set +o pipefail
vendorSha256=$(
nix-build "$nixpkgs" -A v2ray --no-out-link 2>&1 |
tee /dev/stderr |
sed -nE 's/.*got:\s*sha256:(\w+)$/\1/p'
sed -nE 's/.*got:\s*(sha256\S+)$/\1/p'
)
[[ "$vendorSha256" ]]
sed --in-place \