git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #90177 from servalcatty/v2ray

v2ray: 4.23.3 -> 4.26.0

commit6148f6360310366708dff42055a0ba0afa963101 authorMario Rodas <marsam@users.noreply.github.com> dateFri 17 Jul 2020, 00:14 (6 years ago) parentb5e580086f90b3
3 files changed+33−13
pkgs/tools/networking/v2ray/default.nix+8−6 pkgs/tools/networking/v2ray/generic.nix+2−2 pkgs/tools/networking/v2ray/update.sh+23−5
pkgs/tools/networking/v2ray/default.nix+8−6
@@ -3,20 +3,22 @@
33, ... } @ args:
44
55callPackage ./generic.nix (rec {
6− version = "4.23.3";
6+ version = "4.26.0";
77
88 src = fetchFromGitHub {
99 owner = "v2ray";
1010 repo = "v2ray-core";
1111 rev = "v${version}";
12− sha256 = "1b0cxrpgkmgas7pwxglsvgcig8rnhffkf990b42z7awji5lw055v";
12+ sha256 = "069wm0n44i4l9pnrhwf60ssld65p6gfj4wfc68hrhj4zi4jvlyds";
1313 };
1414
15+ vendorSha256 = "1520h69z0inbsrw5505cxbinqakvwcrdx3pisrwnp9lv4jsrzzsr";
16+
1517 assets = {
1618 # MIT licensed
1719 "geoip.dat" = let
18− geoipRev = "202005270003";
19− geoipSha256 = "10gf69hr32p4bpl5j8r46v8xzhpcgm70xbcdxm1a8l0jwyj0infs";
20+ geoipRev = "202007080004";
21+ geoipSha256 = "1j4qg831dhxdy7brgxn4ca69cvwr3zsgizidlzasbkdn2rwai17y";
2022 in fetchurl {
2123 url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat";
2224 sha256 = geoipSha256;
@@ -24,8 +26,8 @@ callPackage ./generic.nix (rec {
2426
2527 # MIT licensed
2628 "geosite.dat" = let
27− geositeRev = "202005292154";
28− geositeSha256 = "0w6l0q8y14in5f4a406blpprqq6p438gpclnlfz7y2hkh5zf36cr";
29+ geositeRev = "20200708125309";
30+ geositeSha256 = "1pr4137ri3v3r880yx5sqf2p7qfn8g7s555q51x3smkjzkyrskcy";
2931 in fetchurl {
3032 url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat";
3133 sha256 = geositeSha256;
pkgs/tools/networking/v2ray/generic.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, linkFarm, buildGoModule, runCommand, makeWrapper
22
33# Version specific args
4−, version, src, assets
4+, version, src, assets, vendorSha256
55, ... }:
66
77let
@@ -13,7 +13,7 @@ let
1313 pname = "v2ray-core";
1414 inherit version src;
1515
16− vendorSha256 = "0d2qmnmlkl884ccg0qcd2yhfj0dwxnb9dz3cih7rcipz85w2f2rs";
16+ inherit vendorSha256;
1717
1818 buildPhase = ''
1919 runHook preBuild
pkgs/tools/networking/v2ray/update.sh+23−5
@@ -1,11 +1,13 @@
11#!/usr/bin/env nix-shell
22#!nix-shell -i bash -p curl jq
33set -eo pipefail
4+cd "$(dirname "${BASH_SOURCE[0]}")"
45
5−version_nix=$(dirname "$0")/default.nix
6−deps_nix=$(dirname "$0")/deps.nix
6+version_nix=./default.nix
7+deps_nix=./deps.nix
8+nixpkgs=../../../..
79
8−old_core_rev="v$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix")"
10+old_core_rev=$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix")
911old_geoip_rev=$(sed -En 's/.*\bgeoipRev = "(.*?)".*/\1/p' "$version_nix")
1012old_geosite_rev=$(sed -En 's/.*\bgeositeRev = "(.*?)".*/\1/p' "$version_nix")
1113echo "Current version:" >&2
@@ -17,6 +19,7 @@ function fetch_latest_rev {
1719}
1820
1921core_rev=$(fetch_latest_rev 'v2ray-core')
22+core_rev=${core_rev:1}
2023geoip_rev=$(fetch_latest_rev 'geoip')
2124geosite_rev=$(fetch_latest_rev 'domain-list-community')
2225echo "Latest version:" >&2
@@ -25,12 +28,13 @@ echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2
2528if [[ $core_rev != $old_core_rev ]]; then
2629 echo "Prefetching core..." >&2
2730 { read hash; read store_path; } < <(
28− nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/$core_rev.zip"
31+ nix-prefetch-url --unpack --print-path "https://github.com/v2ray/v2ray-core/archive/v$core_rev.zip"
2932 )
3033
3134 sed --in-place \
32− -e "s/\bversion = \".*\"/version = \"$(echo "$core_rev" | tail -c+2)\"/" \
35+ -e "s/\bversion = \".*\"/version = \"$core_rev\"/" \
3336 -e "s/\bsha256 = \".*\"/sha256 = \"$hash\"/" \
37+ -e "s/\bvendorSha256 = \".*\"/vendorSha256 = \"0000000000000000000000000000000000000000000000000000\"/" \
3438 "$version_nix"
3539fi
3640
@@ -51,3 +55,17 @@ if [[ $geosite_rev != $old_geosite_rev ]]; then
5155 -e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \
5256 "$version_nix"
5357fi
58+
59+echo "Prebuilding..." >&2
60+set +o pipefail
61+vendorSha256=$(
62+ nix-build "$nixpkgs" -A v2ray --no-out-link 2>&1 |
63+ tee /dev/stderr |
64+ sed -nE 's/.*got:\s*sha256:(\w+)$/\1/p'
65+)
66+[[ "$vendorSha256" ]]
67+sed --in-place \
68+ -e "s/vendorSha256 = \".*\"/vendorSha256 = \"$vendorSha256\"/" \
69+ "$version_nix"
70+
71+echo "vendorSha256 updated" >&2