v2raya: 2.0.2 -> 2.0.5

pkgs/tools/networking/v2raya/default.nix

@@ -7,30 +7,44 @@
 , v2ray-geoip
 , v2ray-domain-list-community
 , symlinkJoin
+, fetchYarnDeps
 }:
 let
   pname = "v2raya";
-  version = "2.0.2";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "v2rayA";
     repo = "v2rayA";
     rev = "v${version}";
-    sha256 = "sha256-C7N23s/GA66gQ5SVXtXcM9lXIjScR3pLYCrf0w2nHfY=";
+    hash = "sha256-oMH4FutgI5mLz2sxDdPFUyDd80xT32r51HEQYhhnvcU=";
+    postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
   };
+  guiSrc = "${src}/gui";
 
   web = mkYarnPackage {
     inherit pname version;
-    src = "${src}/gui";
-    yarnNix = ./yarn.nix;
+
+    src = guiSrc;
     packageJSON = ./package.json;
-    yarnLock = ./yarn.lock;
+
+    offlineCache = fetchYarnDeps {
+      yarnLock = "${guiSrc}/yarn.lock";
+      sha256 = "sha256-hVtETKhG9kX/4a4uO/aQ9sN2eTF6aAYaKDSHJIa0eWQ=";
+    };
+
     buildPhase = ''
       export NODE_OPTIONS=--openssl-legacy-provider
-      ln -s $src/postcss.config.js postcss.config.js
       OUTPUT_DIR=$out yarn --offline build
     '';
+
+    configurePhase = ''
+      cp -r $node_modules node_modules
+      chmod +w node_modules
+    '';
+
     distPhase = "true";
+
     dontInstall = true;
     dontFixup = true;
   };
@@ -45,7 +59,7 @@ buildGoModule {
   inherit pname version;
 
   src = "${src}/service";
-  vendorSha256 = "sha256-vnhqI9G/p+SLLA4sre2wfmg1RKIYZmzeL0pSTbHb+Ck=";
+  vendorSha256 = "sha256-nI+nqftJybAGcHCTMVjYPuLHxqE/kyjUzkspnkzUi+g=";
 
   ldflags = [
     "-s"

pkgs/tools/networking/v2raya/package.json

@@ -13,7 +13,7 @@
     "@nuintun/qrcode": "^3.3.0",
     "@vue/babel-preset-app": "^4.2.2",
     "axios": "^0.21.1",
-    "buefy": "0.9.3",
+    "buefy": "^0.9.22",
     "clipboard": "^2.0.4",
     "dayjs": "^1.10.6",
     "js-base64": "^2.5.1",
@@ -22,8 +22,7 @@
     "pace-js": "^1.2.4",
     "qrcode": "^1.4.2",
     "register-service-worker": "^1.6.2",
-    "uglifyjs-webpack-plugin": "^1.1.1",
-    "vue": "^2.6.10",
+    "vue": "^2.7.14",
     "vue-i18n": "^8.15.3",
     "vue-router": "^3.0.6",
     "vue-virtual-scroller": "^1.0.10",
@@ -31,22 +30,24 @@
     "webpack-iconfont-plugin-nodejs": "^1.0.16"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.2.2",
-    "@vue/cli-plugin-eslint": "^4.0.5",
-    "@vue/cli-plugin-router": "^4.0.0",
-    "@vue/cli-plugin-vuex": "^4.0.0",
-    "@vue/cli-service": "^4.0.0",
+    "@babel/core": "^7.12.16",
+    "@babel/eslint-parser": "^7.12.16",
+    "@vue/cli-plugin-babel": "~5.0.8",
+    "@vue/cli-plugin-eslint": "~5.0.8",
+    "@vue/cli-plugin-router": "~5.0.8",
+    "@vue/cli-plugin-vuex": "~5.0.8",
+    "@vue/cli-service": "~5.0.8",
     "@vue/eslint-config-prettier": "^5.0.0",
-    "babel-eslint": "^10.0.3",
     "css-loader": "^5.2.0",
-    "eslint": "^5.16.0",
-    "eslint-plugin-prettier": "^3.1.1",
-    "eslint-plugin-vue": "^5.0.0",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^8.0.3",
     "highlight.js": "^11.4.0",
-    "prettier": "^1.18.2",
+    "prettier": "^2.4.1",
     "sass": "^1.19.0",
     "sass-loader": "^8.0.0",
-    "urijs": "^1.19.11",
-    "vue-template-compiler": "^2.6.10"
+    "terser-webpack-plugin": "^5.3.6",
+    "urijs": "^1.19.11"
   }
 }