commit a60e4033cad693ccab024aa88f095b056594cc4c · pyrox.dev/nixpkgs

+19 -7
nixos/modules/services/network-filesystems/davfs2.nix
···

       19
       19
        
           else if builtins.isString value then "\"${escapeString value}\""

     

       20
       20
        
           else toString value;

     

       21
       21
        
       

     

       22
       22
       -
         configFile = pkgs.writeText "davfs2.conf" ''

     

       23
       23
       -
           ${toINIWithGlobalSection {

     

       24
       24
       -
             mkSectionName = escapeString;

     

       25
       25
       -
             mkKeyValue = k: v: "${k} ${formatValue v}";

     

       26
       26
       -
           } cfg.settings}

     

       27
       27
       -
           ${cfg.extraConfig}

     

       28
       28
       -
         '';

     

       22
       22
       +
         configFile = pkgs.writeText "davfs2.conf" (

     

       23
       23
       +
           if (cfg.settings != { }) then

     

       24
       24
       +
             (toINIWithGlobalSection {

     

       25
       25
       +
               mkSectionName = escapeString;

     

       26
       26
       +
               mkKeyValue = k: v: "${k} ${formatValue v}";

     

       27
       27
       +
             } cfg.settings)

     

       28
       28
       +
           else

     

       29
       29
       +
             cfg.extraConfig

     

       30
       30
       +
         );

     

       29
       31
        
       in

     

       30
       32
        
       {

     

       31
       33
        
       

     
···

       106
       108
        
         };

     

       107
       109
        
       

     

       108
       110
        
         config = mkIf cfg.enable {

     

       111
       111
       +
       

     

       112
       112
       +
           assertions = [

     

       113
       113
       +
             {

     

       114
       114
       +
               assertion = cfg.extraConfig != "" -> cfg.settings == { };

     

       115
       115
       +
               message = ''

     

       116
       116
       +
                 services.davfs2.extraConfig and services.davfs2.settings cannot be used together.

     

       117
       117
       +
                 Please prefer using services.davfs2.settings.

     

       118
       118
       +
               '';

     

       119
       119
       +
             }

     

       120
       120
       +
           ];

     

       109
       121
        
       

     

       110
       122
        
           warnings = optional (cfg.extraConfig != "") ''

     

       111
       123
        
             services.davfs2.extraConfig will be deprecated in future releases;