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

Merge pull request #262647 from r-ryantm/auto-update/v2ray

Browse source 
v2ray, qv2ray, v2raya: Update
This commit is contained in:
Bobby Rong 2023-10-26 23:31:48 +08:00 committed by GitHub
commit ed605168c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/qv2ray/default.nix
View file

@ -21,13 +21,13 @@
mkDerivation rec { mkDerivation rec {
pname = "qv2ray"; pname = "qv2ray";
version = "unstable-2023-06-09"; version = "unstable-2023-07-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Qv2ray"; owner = "Qv2ray";
repo = "Qv2ray"; repo = "Qv2ray";
rev = "aea9981cc28fe25de55207b93d86036b30d467d2"; rev = "b3080564809dd8aef864a54ca1b79f0984fe986b";
hash = "sha256-ySXAF6fkkKsafuSa3DxkOuRjSyiCDUZRevcfJRp7LPM="; hash = "sha256-LwBjuX5x3kQcdEfPLEirWpkMqOigkhNoh/VNmBfPAzw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

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

@ -6,18 +6,18 @@
buildGoModule rec { buildGoModule rec {
pname = "v2ray-core"; pname = "v2ray-core";
version = "5.7.0"; version = "5.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "v2ray-core"; repo = "v2ray-core";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-gdDV5Cd/DjEqSiOF7j5a8QLtdJiFeNCnHoA4XD+yiGA="; hash = "sha256-fMAPlPn53GkYKpraRS58XTF//IMZtzssaQpBkirEWfw=";
}; };
# `nix-update` doesn't support `vendorHash` yet. # `nix-update` doesn't support `vendorHash` yet.
# https://github.com/Mic92/nix-update/pull/95 # https://github.com/Mic92/nix-update/pull/95
vendorHash = "sha256-uq0v14cRGmstJabrERsa+vFRX6Bg8+5CU6iV8swrL/I="; vendorHash = "sha256-un3faML5u9kmlsJw/hitoRcGYtVukF+V/dJMFyGhr8Q=";
ldflags = [ "-s" "-w" "-buildid=" ]; ldflags = [ "-s" "-w" "-buildid=" ];

13
pkgs/tools/networking/v2raya/default.nix
View file

@ -11,13 +11,13 @@
}: }:
let let
pname = "v2raya"; pname = "v2raya";
version = "2.0.5"; version = "2.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2rayA"; owner = "v2rayA";
repo = "v2rayA"; repo = "v2rayA";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-oMH4FutgI5mLz2sxDdPFUyDd80xT32r51HEQYhhnvcU="; hash = "sha256-X2fCp9uVdt7fIW1C/tdRK1Tmr8mq6VBk6UBnt99E+1c=";
postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
}; };
guiSrc = "${src}/gui"; guiSrc = "${src}/gui";
@ -30,17 +30,20 @@ let
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${guiSrc}/yarn.lock"; yarnLock = "${guiSrc}/yarn.lock";
sha256 = "sha256-hVtETKhG9kX/4a4uO/aQ9sN2eTF6aAYaKDSHJIa0eWQ="; sha256 = "sha256-pB0B5Iy6dLfU5CL2E9OBQGJKLJqYQRwPxx9aaCDg1Qk=";
}; };
buildPhase = '' buildPhase = ''
export NODE_OPTIONS=--openssl-legacy-provider runHook preBuild
OUTPUT_DIR=$out yarn --offline build OUTPUT_DIR=$out yarn --offline build
runHook postBuild
''; '';
configurePhase = '' configurePhase = ''
runHook preConfigure
cp -r $node_modules node_modules cp -r $node_modules node_modules
chmod +w node_modules chmod +w node_modules
runHook postConfigure
''; '';
distPhase = "true"; distPhase = "true";
@ -59,7 +62,7 @@ buildGoModule {
inherit pname version; inherit pname version;
src = "${src}/service"; src = "${src}/service";
vendorHash = "sha256-nI+nqftJybAGcHCTMVjYPuLHxqE/kyjUzkspnkzUi+g="; vendorHash = "sha256-lK6oTI9o8oLXPPMFO/Q97tIsdRd9smUk1v7GwwCFitg=";
ldflags = [ ldflags = [
"-s" "-s"

3
pkgs/tools/networking/v2raya/package.json
View file

@ -8,6 +8,9 @@
"build": "vue-cli-service build", "build": "vue-cli-service build",
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"resolutions": {
"@achrinza/node-ipc": "^10.1.9"
},
"dependencies": { "dependencies": {
"@mdi/font": "^5.8.55", "@mdi/font": "^5.8.55",
"@nuintun/qrcode": "^3.3.0", "@nuintun/qrcode": "^3.3.0",