v2ray: 4.45.0 -> 5.1.0 and refactor

pkgs/tools/networking/v2ray/default.nix

@@ -1,69 +1,63 @@
-{ lib, fetchFromGitHub, fetchurl, symlinkJoin, buildGoModule, runCommand, makeWrapper, nixosTests
+{ lib, fetchFromGitHub, symlinkJoin, buildGoModule, makeWrapper, nixosTests
-, v2ray-geoip, v2ray-domain-list-community, assets ? [ v2ray-geoip v2ray-domain-list-community ]
+, nix-update-script
+, v2ray-geoip, v2ray-domain-list-community
+, assets ? [ v2ray-geoip v2ray-domain-list-community ]
 }:
 
-let
+buildGoModule rec {
-  version = "4.45.0";
+  pname = "v2ray-core";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "v2fly";
     repo = "v2ray-core";
     rev = "v${version}";
-    sha256 = "sha256-vVCWCppGeAc7dwY0fX+G0CU3Vy6OBPpDBUOBK3ykg60=";
+    hash = "sha256-87BtyaJN6qbinZQ+6MAwaK62YzbVnncj4qnEErG5tfA=";
   };
 
-  vendorSha256 = "sha256-TbWMbIT578I8xbNsKgBeSP4MewuEKpfh62ZbJIeHgDs=";
+  # `nix-update` doesn't support `vendorHash` yet.
+  # https://github.com/Mic92/nix-update/pull/95
+  vendorSha256 = "sha256-RuDCAgTzqwe5fUwa9ce2wRx4FPT8siRLbP7mU8/jg/Y=";
+
+  ldflags = [ "-s" "-w" "-buildid=" ];
+
+  subPackages = [ "main" ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 "$GOPATH"/bin/main $out/bin/v2ray
+    install -Dm444 release/config/systemd/system/v2ray{,@}.service -t $out/lib/systemd/system
+    install -Dm444 release/config/*.json -t $out/etc/v2ray
+    runHook postInstall
+  '';
 
   assetsDrv = symlinkJoin {
     name = "v2ray-assets";
     paths = assets;
   };
 
-  core = buildGoModule rec {
+  postFixup = ''
-    pname = "v2ray-core";
+    wrapProgram $out/bin/v2ray \
-    inherit version src;
+      --suffix XDG_DATA_DIRS : $assetsDrv/share
-
+    substituteInPlace $out/lib/systemd/system/*.service \
-    inherit vendorSha256;
+      --replace User=nobody DynamicUser=yes \
-
+      --replace /usr/local/bin/ $out/bin/ \
-    doCheck = false;
+      --replace /usr/local/etc/ /etc/
-
+  '';
-    buildPhase = ''
-      buildFlagsArray=(-v -p $NIX_BUILD_CORES -ldflags="-s -w")
-      runHook preBuild
-      go build "''${buildFlagsArray[@]}" -o v2ray ./main
-      go build "''${buildFlagsArray[@]}" -o v2ctl -tags confonly ./infra/control/main
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      install -Dm755 v2ray v2ctl -t $out/bin
-    '';
-
-    meta = {
-      homepage = "https://www.v2fly.org/en_US/";
-      description = "A platform for building proxies to bypass network restrictions";
-      license = with lib.licenses; [ mit ];
-      maintainers = with lib.maintainers; [ servalcatty ];
-    };
-  };
-
-in runCommand "v2ray-${version}" {
-  inherit src version;
-  inherit (core) meta;
-
-  nativeBuildInputs = [ makeWrapper ];
 
   passthru = {
-    inherit core;
+    updateScript = nix-update-script {
-    updateScript = ./update.sh;
+      attrPath = "v2ray";
-    tests = {
-      simple-vmess-proxy-test = nixosTests.v2ray;
     };
+    tests.simple-vmess-proxy-test = nixosTests.v2ray;
   };
 
-} ''
+  meta = {
-  for file in ${core}/bin/*; do
+    homepage = "https://www.v2fly.org/en_US/";
-    makeWrapper "$file" "$out/bin/$(basename "$file")" \
+    description = "A platform for building proxies to bypass network restrictions";
-      --set-default V2RAY_LOCATION_ASSET ${assetsDrv}/share/v2ray
+    license = with lib.licenses; [ mit ];
-  done
+    maintainers = with lib.maintainers; [ servalcatty ];
-''
+  };
+}

pkgs/tools/networking/v2ray/update.sh

@@ -1,49 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq
-set -eo pipefail
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-version_nix=./default.nix
-deps_nix=./deps.nix
-nixpkgs=../../../..
-
-old_core_rev=$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix")
-echo "Current version:" >&2
-echo "core: $old_core_rev" >&2
-
-function fetch_latest_rev {
-    curl "https://api.github.com/repos/v2fly/$1/releases" |
-        jq '.[0].tag_name' --raw-output
-}
-
-core_rev=$(fetch_latest_rev 'v2ray-core')
-core_rev=${core_rev:1}
-echo "Latest version:" >&2
-echo "core: $core_rev" >&2
-
-if [[ $core_rev != $old_core_rev ]]; then
-    echo "Prefetching core..." >&2
-    { read hash; read store_path; } < <(
-        nix-prefetch-url --unpack --print-path "https://github.com/v2fly/v2ray-core/archive/v$core_rev.zip"
-    )
-
-    sed --in-place \
-        -e "s/\bversion = \".*\"/version = \"$core_rev\"/" \
-        -e "s/\bsha256 = \".*\"/sha256 = \"$hash\"/" \
-        -e "s/\bvendorSha256 = \".*\"/vendorSha256 = \"0000000000000000000000000000000000000000000000000000\"/" \
-        "$version_nix"
-fi
-
-echo "Prebuilding..." >&2
-set +o pipefail
-vendorSha256=$(
-    nix-build "$nixpkgs" -A v2ray --no-out-link 2>&1 |
-    tee /dev/stderr |
-    sed -nE 's/.*got:\s*(sha256\S+)$/\1/p'
-)
-[[ "$vendorSha256" ]]
-sed --in-place \
-    -e "s#vendorSha256 = \".*\"#vendorSha256 = \"$vendorSha256\"#" \
-    "$version_nix"
-
-echo "vendorSha256 updated" >&2