From 00d2701b971df1f73b87e0a391ccd93e54833a01 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 10 Jan 2022 10:06:47 +1000 Subject: [PATCH] v2ray, v2ray-domain-list-community: switch to go_1_17, update `vendorSha256` --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 2 +- pkgs/tools/networking/v2ray/default.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 270a110b62f3..218ae3d80df8 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -10,7 +10,7 @@ let rev = version; sha256 = "sha256-wDz4msCaX6BPzxrg5GeZSrMuxsCx8uimhaHghWdDp8s="; }; - vendorSha256 = "sha256-p0EPYOw3vuqHiVSrZR7SA7vE0DWA7xyupWM+JznjF+o="; + vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index d3ea5a071e10..ba1fcb6d0362 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -12,7 +12,7 @@ let sha256 = "1yk02n2lllbcwqkz4f3l3d2df1w3m768zxvdawgmafjgmbqf0gjf"; }; - vendorSha256 = "sha256-7zSIAKcMwtaTvokKuLJ8orqJc2jGuaw5FglEJadeZ9I="; + vendorSha256 = "sha256-kTwISKPIFpb/OPh9rIzLH8a6mqpyDBJo2stSu5bc02Q="; assetsDrv = symlinkJoin { name = "v2ray-assets"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 182c25a38c92..92eb0ff1efe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10488,9 +10488,13 @@ with pkgs; uwufetch = callPackage ../tools/misc/uwufetch { }; - v2ray = callPackage ../tools/networking/v2ray { }; + v2ray = callPackage ../tools/networking/v2ray { + buildGoModule = buildGo117Module; + }; - v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { }; + v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { + pkgsBuildBuild.buildGoModule = pkgsBuildBuild.buildGo117Module; + }; v2ray-geoip = callPackage ../data/misc/v2ray-geoip { };