commit 7c2f22b376f2de91b4ffd9bbe14db40e0430d3ee · pyrox.dev/nixpkgs

+1 -1

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

···

       562
       562
        
       

     

       563
       563
        
       - All services that require a root certificate bundle now use the value of a new read-only option, `security.pki.caBundle`.

     

       564
       564
        
       

     

       565
       565
       -
       - hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes.

     

       565
       565
       +
       - hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes. The settings options have been modified to use an attrset, enabling configurations with multiple instances of the daemon running at once, eg, for two separate drive bays.

     

       566
       566
        
       

     

       567
       567
        
       - `nextcloud-news-updater` is unmaintained and was removed from nixpkgs.

     

       568
       568

+143 -51

nixos/modules/services/hardware/hddfancontrol.nix

···

       18
       18
        
             "hddfancontrol"

     

       19
       19
        
             "smartctl"

     

       20
       20
        
           ] "Smartctl is now automatically used when necessary, which makes this option redundant")

     

       21
       21
       +
           (lib.mkRemovedOptionModule [

     

       22
       22
       +
             "services"

     

       23
       23
       +
             "hddfancontrol"

     

       24
       24
       +
             "disks"

     

       25
       25
       +
           ] "Disks should now be specified per hddfancontrol instance in its attrset")

     

       26
       26
       +
           (lib.mkRemovedOptionModule [

     

       27
       27
       +
             "services"

     

       28
       28
       +
             "hddfancontrol"

     

       29
       29
       +
             "pwmPaths"

     

       30
       30
       +
           ] "Pwm Paths should now be specified per hddfancontrol instance in its attrset")

     

       31
       31
       +
           (lib.mkRemovedOptionModule [

     

       32
       32
       +
             "services"

     

       33
       33
       +
             "hddfancontrol"

     

       34
       34
       +
             "logVerbosity"

     

       35
       35
       +
           ] "Log Verbosity should now be specified per hddfancontrol instance in its attrset")

     

       36
       36
       +
           (lib.mkRemovedOptionModule [

     

       37
       37
       +
             "services"

     

       38
       38
       +
             "hddfancontrol"

     

       39
       39
       +
             "extraArgs"

     

       40
       40
       +
           ] "Extra Args should now be specified per hddfancontrol instance in its attrset")

     

       21
       41
        
         ];

     

       22
       42
        
       

     

       23
       43
        
         options = {

     

       24
       44
        
           services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon";

     

       25
       45
        
       

     

       26
       26
       -
           services.hddfancontrol.disks = lib.mkOption {

     

       27
       27
       -
             type = lib.types.listOf lib.types.path;

     

       28
       28
       -
             default = [ ];

     

       29
       29
       -
             description = ''

     

       30
       30
       -
               Drive(s) to get temperature from

     

       31
       31
       -
             '';

     

       32
       32
       -
             example = [ "/dev/sda" ];

     

       33
       33
       -
           };

     

       46
       46
       +
           services.hddfancontrol.settings = lib.mkOption {

     

       47
       47
       +
             type = lib.types.attrsWith {

     

       48
       48
       +
               placeholder = "drive-bay-name";

     

       49
       49
       +
               elemType = (

     

       50
       50
       +
                 lib.types.submodule (

     

       51
       51
       +
                   { ... }:

     

       52
       52
       +
                   {

     

       53
       53
       +
                     options = {

     

       54
       54
       +
                       disks = lib.mkOption {

     

       55
       55
       +
                         type = lib.types.listOf lib.types.path;

     

       56
       56
       +
                         default = [ ];

     

       57
       57
       +
                         description = ''

     

       58
       58
       +
                           Drive(s) to get temperature from

     

       59
       59
       +
                         '';

     

       60
       60
       +
                         example = [ "/dev/sda" ];

     

       61
       61
       +
                       };

     

       34
       62
        
       

     

       35
       35
       -
           services.hddfancontrol.pwmPaths = lib.mkOption {

     

       36
       36
       -
             type = lib.types.listOf lib.types.path;

     

       37
       37
       -
             default = [ ];

     

       38
       38
       -
             description = ''

     

       39
       39
       -
               PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values

     

       40
       40
       -
             '';

     

       41
       41
       -
             example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ];

     

       42
       42
       -
           };

     

       63
       63
       +
                       pwmPaths = lib.mkOption {

     

       64
       64
       +
                         type = lib.types.listOf lib.types.path;

     

       65
       65
       +
                         default = [ ];

     

       66
       66
       +
                         description = ''

     

       67
       67
       +
                           PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values

     

       68
       68
       +
                         '';

     

       69
       69
       +
                         example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ];

     

       70
       70
       +
                       };

     

       43
       71
        
       

     

       44
       44
       -
           services.hddfancontrol.logVerbosity = lib.mkOption {

     

       45
       45
       -
             type = lib.types.enum [

     

       46
       46
       -
               "TRACE"

     

       47
       47
       -
               "DEBUG"

     

       48
       48
       -
               "INFO"

     

       49
       49
       -
               "WARN"

     

       50
       50
       -
               "ERROR"

     

       51
       51
       -
             ];

     

       52
       52
       -
             default = "INFO";

     

       53
       53
       -
             description = ''

     

       54
       54
       -
               Verbosity of the log level

     

       55
       55
       -
             '';

     

       56
       56
       -
           };

     

       72
       72
       +
                       logVerbosity = lib.mkOption {

     

       73
       73
       +
                         type = lib.types.enum [

     

       74
       74
       +
                           "TRACE"

     

       75
       75
       +
                           "DEBUG"

     

       76
       76
       +
                           "INFO"

     

       77
       77
       +
                           "WARN"

     

       78
       78
       +
                           "ERROR"

     

       79
       79
       +
                         ];

     

       80
       80
       +
                         default = "INFO";

     

       81
       81
       +
                         description = ''

     

       82
       82
       +
                           Verbosity of the log level

     

       83
       83
       +
                         '';

     

       84
       84
       +
                       };

     

       57
       85
        
       

     

       58
       58
       -
           services.hddfancontrol.extraArgs = lib.mkOption {

     

       59
       59
       -
             type = lib.types.listOf lib.types.str;

     

       60
       60
       -
             default = [ ];

     

       86
       86
       +
                       extraArgs = lib.mkOption {

     

       87
       87
       +
                         type = lib.types.listOf lib.types.str;

     

       88
       88
       +
                         default = [ ];

     

       89
       89
       +
                         description = ''

     

       90
       90
       +
                           Extra commandline arguments for hddfancontrol

     

       91
       91
       +
                         '';

     

       92
       92
       +
                         example = [

     

       93
       93
       +
                           "--min-fan-speed-prct=10"

     

       94
       94
       +
                           "--interval=1min"

     

       95
       95
       +
                         ];

     

       96
       96
       +
                       };

     

       97
       97
       +
                     };

     

       98
       98
       +
                   }

     

       99
       99
       +
                 )

     

       100
       100
       +
               );

     

       101
       101
       +
             };

     

       102
       102
       +
             default = { };

     

       61
       103
        
             description = ''

     

       62
       62
       -
               Extra commandline arguments for hddfancontrol

     

       104
       104
       +
               Parameter-sets for each instance of hddfancontrol.

     

       105
       105
       +
             '';

     

       106
       106
       +
             example = lib.literalExpression ''

     

       107
       107
       +
               {

     

       108
       108
       +
                 harddrives = {

     

       109
       109
       +
                   disks = [

     

       110
       110
       +
                     "/dev/sda"

     

       111
       111
       +
                     "/dev/sdb"

     

       112
       112
       +
                     "/dev/sdc"

     

       113
       113
       +
                   ];

     

       114
       114
       +
                   pwmPaths = [

     

       115
       115
       +
                     "/sys/class/hwmon/hwmon1/pwm1:25:10"

     

       116
       116
       +
                   ];

     

       117
       117
       +
                   logVerbosity = "DEBUG";

     

       118
       118
       +
                 };

     

       119
       119
       +
                 ssddrives = {

     

       120
       120
       +
                   disks = [

     

       121
       121
       +
                     "/dev/sdd"

     

       122
       122
       +
                     "/dev/sde"

     

       123
       123
       +
                     "/dev/sdf"

     

       124
       124
       +
                   ];

     

       125
       125
       +
                   pwmPaths = [

     

       126
       126
       +
                     "/sys/class/hwmon/hwmon1/pwm2:25:10"

     

       127
       127
       +
                   ];

     

       128
       128
       +
                   extraArgs = [

     

       129
       129
       +
                     "--interval=30s"

     

       130
       130
       +
                   ];

     

       131
       131
       +
                 };

     

       132
       132
       +
               }

     

       63
       133
        
             '';

     

       64
       64
       -
             example = [

     

       65
       65
       -
               "--min-fan-speed-prct=10"

     

       66
       66
       -
               "--interval=1min"

     

       67
       67
       -
             ];

     

       68
       134
        
           };

     

       69
       135
        
         };

     

       70
       136
        
       

     

       71
       137
        
         config = lib.mkIf cfg.enable (

     

       72
       138
        
           let

     

       73
       73
       -
             args = lib.concatLists [

     

       74
       74
       -
               [ "-d" ]

     

       75
       75
       -
               cfg.disks

     

       76
       76
       -
               [ "-p" ]

     

       77
       77
       -
               cfg.pwmPaths

     

       78
       78
       -
               cfg.extraArgs

     

       139
       139
       +
             args =

     

       140
       140
       +
               cnf:

     

       141
       141
       +
               lib.concatLists [

     

       142
       142
       +
                 [ "-d" ]

     

       143
       143
       +
                 cnf.disks

     

       144
       144
       +
                 [ "-p" ]

     

       145
       145
       +
                 cnf.pwmPaths

     

       146
       146
       +
                 cnf.extraArgs

     

       147
       147
       +
               ];

     

       148
       148
       +
       

     

       149
       149
       +
             createService = cnf: {

     

       150
       150
       +
               description = "HDD fan control";

     

       151
       151
       +
               documentation = [ "man:hddfancontrol(1)" ];

     

       152
       152
       +
               after = [ "hddtemp.service" ];

     

       153
       153
       +
               wants = [ "hddtemp.service" ];

     

       154
       154
       +
               serviceConfig = {

     

       155
       155
       +
                 ExecStart = "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${lib.escapeShellArgs (args cnf)}";

     

       156
       156
       +
       

     

       157
       157
       +
                 CPUSchedulingPolicy = "rr";

     

       158
       158
       +
                 CPUSchedulingPriority = 49;

     

       159
       159
       +
       

     

       160
       160
       +
                 ProtectSystem = "strict";

     

       161
       161
       +
                 PrivateTmp = true;

     

       162
       162
       +
                 ProtectHome = true;

     

       163
       163
       +
                 SystemCallArchitectures = "native";

     

       164
       164
       +
                 MemoryDenyWriteExecute = true;

     

       165
       165
       +
                 NoNewPrivileges = true;

     

       166
       166
       +
               };

     

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

     

       168
       168
       +
             };

     

       169
       169
       +
       

     

       170
       170
       +
             services = lib.attrsets.mergeAttrsList [

     

       171
       171
       +
               (lib.attrsets.mapAttrs' (

     

       172
       172
       +
                 name: cnf: lib.nameValuePair "hddfancontrol-${name}" (createService cnf)

     

       173
       173
       +
               ) cfg.settings)

     

       174
       174
       +
               {

     

       175
       175
       +
                 "hddfancontrol".enable = false;

     

       176
       176
       +
               }

     

       79
       177
        
             ];

     

       80
       178
        
           in

     

       81
       179
        
           {

     
···

       83
       181
        
       

     

       84
       182
        
             hardware.sensor.hddtemp = {

     

       85
       183
        
               enable = true;

     

       86
       86
       -
               drives = cfg.disks;

     

       184
       184
       +
               drives = lib.lists.flatten (lib.attrsets.catAttrs "disks" (lib.attrsets.attrValues cfg.settings));

     

       87
       185
        
             };

     

       88
       186
        
       

     

       89
       89
       -
             systemd.services.hddfancontrol = {

     

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

     

       91
       91
       -
               environment = {

     

       92
       92
       -
                 HDDFANCONTROL_LOG_LEVEL = cfg.logVerbosity;

     

       93
       93
       -
                 HDDFANCONTROL_DAEMON_ARGS = lib.escapeShellArgs args;

     

       94
       94
       -
               };

     

       95
       95
       -
             };

     

       187
       187
       +
             systemd.services = services;

     

       96
       188
        
           }

     

       97
       189
        
         );

     

       98
       190
        
       }