commit a1291d0d020a200c7ce3c48e96090bfa4890a475 · pyrox.dev/nixpkgs

+30 -19

nixos/modules/services/networking/v2raya.nix

···

       12
       12
        
         config = mkIf config.services.v2raya.enable {

     

       13
       13
        
           environment.systemPackages = [ pkgs.v2raya ];

     

       14
       14
        
       

     

       15
       15
       -
           systemd.services.v2raya = {

     

       16
       16
       -
             unitConfig = {

     

       17
       17
       -
               Description = "v2rayA service";

     

       18
       18
       -
               Documentation = "https://github.com/v2rayA/v2rayA/wiki";

     

       19
       19
       -
               After = [ "network.target" "nss-lookup.target" "iptables.service" "ip6tables.service" ];

     

       20
       20
       -
               Wants = [ "network.target" ];

     

       21
       21
       -
             };

     

       15
       15
       +
           systemd.services.v2raya =

     

       16
       16
       +
             let

     

       17
       17
       +
               nftablesEnabled = config.networking.nftables.enable;

     

       18
       18
       +
               iptablesServices = [

     

       19
       19
       +
                 "iptables.service"

     

       20
       20
       +
               ] ++ optional config.networking.enableIPv6 "ip6tables.service";

     

       21
       21
       +
               tableServices = if nftablesEnabled then [ "nftables.service" ] else iptablesServices;

     

       22
       22
       +
             in

     

       23
       23
       +
             {

     

       24
       24
       +
               unitConfig = {

     

       25
       25
       +
                 Description = "v2rayA service";

     

       26
       26
       +
                 Documentation = "https://github.com/v2rayA/v2rayA/wiki";

     

       27
       27
       +
                 After = [

     

       28
       28
       +
                   "network.target"

     

       29
       29
       +
                   "nss-lookup.target"

     

       30
       30
       +
                 ] ++ tableServices;

     

       31
       31
       +
                 Wants = [ "network.target" ];

     

       32
       32
       +
               };

     

       33
       33
       +
       

     

       34
       34
       +
               serviceConfig = {

     

       35
       35
       +
                 User = "root";

     

       36
       36
       +
                 ExecStart = "${getExe pkgs.v2raya} --log-disable-timestamp";

     

       37
       37
       +
                 Environment = [ "V2RAYA_LOG_FILE=/var/log/v2raya/v2raya.log" ];

     

       38
       38
       +
                 LimitNPROC = 500;

     

       39
       39
       +
                 LimitNOFILE = 1000000;

     

       40
       40
       +
                 Restart = "on-failure";

     

       41
       41
       +
                 Type = "simple";

     

       42
       42
       +
               };

     

       22
       43
        
       

     

       23
       23
       -
             serviceConfig = {

     

       24
       24
       -
               User = "root";

     

       25
       25
       -
               ExecStart = "${getExe pkgs.v2raya} --log-disable-timestamp";

     

       26
       26
       -
               Environment = [ "V2RAYA_LOG_FILE=/var/log/v2raya/v2raya.log" ];

     

       27
       27
       -
               LimitNPROC = 500;

     

       28
       28
       -
               LimitNOFILE = 1000000;

     

       29
       29
       -
               Restart = "on-failure";

     

       30
       30
       -
               Type = "simple";

     

       44
       44
       +
               wantedBy = [ "multi-user.target" ];

     

       45
       45
       +
               path = with pkgs; [ iptables bash iproute2 ]; # required by v2rayA TProxy functionality

     

       31
       46
        
             };

     

       32
       32
       -
       

     

       33
       33
       -
             wantedBy = [ "multi-user.target" ];

     

       34
       34
       -
             path = with pkgs; [ iptables bash iproute2 ]; # required by v2rayA TProxy functionality

     

       35
       35
       -
           };

     

       36
       47
        
         };

     

       37
       48
        
       

     

       38
       49
        
         meta.maintainers = with maintainers; [ elliot ];

+15 -4

pkgs/tools/networking/v2raya/default.nix

···

       11
       11
        
       let

     

       12
       12
        
         pname = "v2raya";

     

       13
       13
        
         version = "2.0.0";

     

       14
       14
       +
       

     

       14
       15
        
         src = fetchFromGitHub {

     

       15
       16
        
           owner = "v2rayA";

     

       16
       17
        
           repo = "v2rayA";

     

       17
       18
        
           rev = "v${version}";

     

       18
       19
        
           sha256 = "sha256-1fWcrMd+TSrlS1H0z7XwVCQzZAa8DAFtlekEZNRMAPA=";

     

       19
       20
        
         };

     

       21
       21
       +
       

     

       20
       22
        
         web = mkYarnPackage {

     

       21
       23
        
           inherit pname version;

     

       22
       24
        
           src = "${src}/gui";

     
···

       32
       34
        
           dontInstall = true;

     

       33
       35
        
           dontFixup = true;

     

       34
       36
        
         };

     

       37
       37
       +
       

     

       38
       38
       +
         assetsDir = symlinkJoin {

     

       39
       39
       +
           name = "assets";

     

       40
       40
       +
           paths = [ v2ray-geoip v2ray-domain-list-community ];

     

       41
       41
       +
         };

     

       42
       42
       +
       

     

       35
       43
        
       in

     

       36
       44
        
       buildGoModule {

     

       37
       45
        
         inherit pname version;

     

       46
       46
       +
       

     

       38
       47
        
         src = "${src}/service";

     

       39
       48
        
         vendorSha256 = "sha256-Ud4pwS0lz7zSTowg3gXNllfDyj8fu33H1L20szxPcOA=";

     

       49
       49
       +
       

     

       40
       50
        
         ldflags = [

     

       41
       51
        
           "-s"

     

       42
       52
        
           "-w"

     

       43
       53
        
           "-X github.com/v2rayA/v2rayA/conf.Version=${version}"

     

       44
       54
        
         ];

     

       55
       55
       +
       

     

       45
       56
        
         subPackages = [ "." ];

     

       57
       57
       +
       

     

       46
       58
        
         nativeBuildInputs = [ makeWrapper ];

     

       47
       59
        
         preBuild = ''

     

       48
       60
        
           cp -a ${web} server/router/web

     

       49
       61
        
         '';

     

       62
       62
       +
       

     

       50
       63
        
         postInstall = ''

     

       51
       64
        
           install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications

     

       52
       65
        
           install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps

     
···

       55
       68
        
       

     

       56
       69
        
           wrapProgram $out/bin/v2rayA \

     

       57
       70
        
             --prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \

     

       58
       58
       -
             --prefix XDG_DATA_DIRS ":" ${symlinkJoin {

     

       59
       59
       -
               name = "assets";

     

       60
       60
       -
               paths = [ v2ray-geoip v2ray-domain-list-community ];

     

       61
       61
       -
             }}/share

     

       71
       71
       +
             --prefix XDG_DATA_DIRS ":" ${assetsDir}/share

     

       62
       72
        
         '';

     

       73
       73
       +
       

     

       63
       74
        
         meta = with lib; {

     

       64
       75
        
           description = "A Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel";

     

       65
       76
        
           homepage = "https://github.com/v2rayA/v2rayA";