commit d61966e38106a72cce9b9e57a992fc55d7d9df36 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2505.section.md

···

       212
       212
        
       - `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0).

     

       213
       213
        
         `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable.

     

       214
       214
        
       

     

       215
       215
       +
       - `programs.clash-verge.tunMode` was deprecated and removed because now service mode is neccessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start.

     

       216
       216
       +
       

     

       215
       217
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     

       216
       218
        
       

     

       217
       219
        
       ## Other Notable Changes {#sec-release-25.05-notable-changes}

+19 -8

nixos/modules/programs/clash-verge.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       {

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (lib.mkRemovedOptionModule [ "programs" "clash-verge" "tunMode" ] ''

     

       11
       11
       +
             The tunMode will work with service mode which is enabled by default.

     

       12
       12
       +
           '')

     

       13
       13
       +
         ];

     

       9
       14
        
         options.programs.clash-verge = {

     

       10
       15
        
           enable = lib.mkEnableOption "Clash Verge";

     

       11
       16
        
           package = lib.mkOption {

     
···

       15
       20
        
               clash-verge-rev and clash-nyanpasu, both are forks of

     

       16
       21
        
               the original clash-verge project.

     

       17
       22
        
             '';

     

       18
       18
       -
             example = "pkgs.clash-verge-rev";

     

       23
       23
       +
             default = pkgs.clash-verge-rev;

     

       24
       24
       +
             defaultText = lib.literalExpression "pkgs.clash-verge-rev";

     

       19
       25
        
           };

     

       20
       26
        
           autoStart = lib.mkEnableOption "Clash Verge auto launch";

     

       21
       21
       -
           tunMode = lib.mkEnableOption "Clash Verge TUN mode";

     

       22
       27
        
         };

     

       23
       28
        
       

     

       24
       29
        
         config =

     
···

       37
       42
        
               ))

     

       38
       43
        
             ];

     

       39
       44
        
       

     

       40
       40
       -
             security.wrappers.clash-verge = lib.mkIf cfg.tunMode {

     

       41
       41
       -
               owner = "root";

     

       42
       42
       -
               group = "root";

     

       43
       43
       -
               capabilities = "cap_net_bind_service,cap_net_admin=+ep";

     

       44
       44
       -
               source = "${lib.getExe cfg.package}";

     

       45
       45
       +
             systemd.services.clash-verge = {

     

       46
       46
       +
               enable = true;

     

       47
       47
       +
               description = "Clash Verge Service Mode";

     

       48
       48
       +
               serviceConfig = {

     

       49
       49
       +
                 ExecStart = "${cfg.package}/bin/clash-verge-service";

     

       50
       50
       +
                 Restart = "on-failure";

     

       51
       51
       +
               };

     

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

     

       45
       53
        
             };

     

       46
       54
        
           };

     

       47
       55
        
       

     

       48
       48
       -
         meta.maintainers = with lib.maintainers; [ zendo ];

     

       56
       56
       +
         meta.maintainers = with lib.maintainers; [

     

       57
       57
       +
           bot-wxt1221

     

       58
       58
       +
           Guanran928

     

       59
       59
       +
         ];

     

       49
       60
        
       }