cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #106259 from servalcatty/v2ray

Browse source 
v2ray: 4.32.1 -> 4.33.0
This commit is contained in:
Mario Rodas 2020-12-08 03:58:34 -05:00 committed by GitHub
commit 72b9f48cdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/tools/networking/v2ray/default.nix
View file

@ -3,22 +3,22 @@
}:
let
version = "4.32.1";
version = "4.33.0";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
sha256 = "1mlrl5fz1v3bcb83pczqp859d8w9mi7jj600a2yw7xm372w2irk8";
sha256 = "05w714i56nipp7m985g6zqq6ljz0w5ihxrgs93j10llfdd089iig";
};
vendorSha256 = "1mz1acdj8ailgyqrr1v47n36qc24ggzw5rmj4p2awfwz3gp2yz6z";
vendorSha256 = "0ix5kxldgbcb10jh0l64lrh8qzla4qvsxi6vanb73y7lbsix120w";
assets = {
# MIT licensed
"geoip.dat" = let
geoipRev = "202011050012";
geoipSha256 = "1d2n3hskgdmcfk1nl7a8lxxz325p84i7gz44cs77z1m9r7c2vsjy";
geoipRev = "202012030015";
geoipSha256 = "1qy9h0721y5kjcp0s859lhj253jfi3d3i658gpc4kmij2l5dxm5w";
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 = "20201102141726";
geositeSha256 = "0sn2f5vd6w94ryh845mnbfyjzycg7cvb66rkzh37pg9l7fvgs4jh";
geositeRev = "20201207123222";
geositeSha256 = "03xckk39rrda42cam2awbsh0gib6rhmz28asc8vx29lsp9g2bj6n";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;
@ -61,11 +61,9 @@ let
'';
meta = {
homepage = "https://www.v2ray.com/en/index.html";
homepage = "https://www.v2fly.org/en_US/";
description = "A platform for building proxies to bypass network restrictions";
# The license of the dependency `https://github.com/XTLS/Go` doesn't allowed user to modify its source code,
# which made it unfree.
license = with lib.licenses; [ mit unfree ];
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ servalcatty ];
};
};
@ -77,6 +75,7 @@ in runCommand "v2ray-${version}" {
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit core;
updateScript = ./update.sh;
tests = {
simple-vmess-proxy-test = nixosTests.v2ray;