Unverified Commit dfcfab99 authored by Elliot's avatar Elliot Committed by Bobby Rong
Browse files

v2raya: 2.0.5 -> 2.2.4 

https://github.com/v2rayA/v2rayA/compare/v2.0.5...v2.2.4



This fixes startup issue with go 1.21, see upstream issue 1017.

Co-authored-by: default avatarBobby Rong <rjl931189261@126.com>
parent 6cebc9e8

pkgs/tools/networking/v2raya/default.nix

+8 −5
Original line number Diff line number Diff line
@@ -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"

pkgs/tools/networking/v2raya/package.json

+3 −0
Original line number Diff line number Diff line
@@ -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",