diff options
author | Bobby Rong <rjl931189261@126.com> | 2023-10-26 23:31:48 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-26 23:31:48 +0800 |
commit | ed605168c0b9529d6f052e8fb3fef3607db4f879 (patch) | |
tree | 1fc8fc485f681b2720232f44ef7b61caee9f6ed6 /pkgs/tools/networking | |
parent | 14f19f0dcf113069291c155e0794bb2974fbffaf (diff) | |
parent | dfcfab99863cfe3b64c24248b48e0237dfc47c29 (diff) | |
download | nixpkgs-ed605168c0b9529d6f052e8fb3fef3607db4f879.tar nixpkgs-ed605168c0b9529d6f052e8fb3fef3607db4f879.tar.gz nixpkgs-ed605168c0b9529d6f052e8fb3fef3607db4f879.tar.bz2 nixpkgs-ed605168c0b9529d6f052e8fb3fef3607db4f879.tar.lz nixpkgs-ed605168c0b9529d6f052e8fb3fef3607db4f879.tar.xz nixpkgs-ed605168c0b9529d6f052e8fb3fef3607db4f879.tar.zst nixpkgs-ed605168c0b9529d6f052e8fb3fef3607db4f879.zip |
Merge pull request #262647 from r-ryantm/auto-update/v2ray
v2ray, qv2ray, v2raya: Update
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/v2ray/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/v2raya/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/networking/v2raya/package.json | 3 |
3 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index cb0132a64ad..34f1fd48335 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-gdDV5Cd/DjEqSiOF7j5a8QLtdJiFeNCnHoA4XD+yiGA="; + hash = "sha256-fMAPlPn53GkYKpraRS58XTF//IMZtzssaQpBkirEWfw="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-uq0v14cRGmstJabrERsa+vFRX6Bg8+5CU6iV8swrL/I="; + vendorHash = "sha256-un3faML5u9kmlsJw/hitoRcGYtVukF+V/dJMFyGhr8Q="; ldflags = [ "-s" "-w" "-buildid=" ]; diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/tools/networking/v2raya/default.nix index a2d539326e3..c861fd68c8b 100644 --- a/pkgs/tools/networking/v2raya/default.nix +++ b/pkgs/tools/networking/v2raya/default.nix @@ -11,13 +11,13 @@ }: let pname = "v2raya"; - version = "2.0.5"; + version = "2.2.4"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; rev = "v${version}"; - hash = "sha256-oMH4FutgI5mLz2sxDdPFUyDd80xT32r51HEQYhhnvcU="; + hash = "sha256-X2fCp9uVdt7fIW1C/tdRK1Tmr8mq6VBk6UBnt99E+1c="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; guiSrc = "${src}/gui"; @@ -30,17 +30,20 @@ let offlineCache = fetchYarnDeps { yarnLock = "${guiSrc}/yarn.lock"; - sha256 = "sha256-hVtETKhG9kX/4a4uO/aQ9sN2eTF6aAYaKDSHJIa0eWQ="; + sha256 = "sha256-pB0B5Iy6dLfU5CL2E9OBQGJKLJqYQRwPxx9aaCDg1Qk="; }; buildPhase = '' - export NODE_OPTIONS=--openssl-legacy-provider + runHook preBuild OUTPUT_DIR=$out yarn --offline build + runHook postBuild ''; configurePhase = '' + runHook preConfigure cp -r $node_modules node_modules chmod +w node_modules + runHook postConfigure ''; distPhase = "true"; @@ -59,7 +62,7 @@ buildGoModule { inherit pname version; src = "${src}/service"; - vendorHash = "sha256-nI+nqftJybAGcHCTMVjYPuLHxqE/kyjUzkspnkzUi+g="; + vendorHash = "sha256-lK6oTI9o8oLXPPMFO/Q97tIsdRd9smUk1v7GwwCFitg="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/v2raya/package.json b/pkgs/tools/networking/v2raya/package.json index 55c1c470566..3886aaa1616 100644 --- a/pkgs/tools/networking/v2raya/package.json +++ b/pkgs/tools/networking/v2raya/package.json @@ -8,6 +8,9 @@ "build": "vue-cli-service build", "lint": "vue-cli-service lint" }, + "resolutions": { + "@achrinza/node-ipc": "^10.1.9" + }, "dependencies": { "@mdi/font": "^5.8.55", "@nuintun/qrcode": "^3.3.0", |