mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
Merge pull request #239801 from benley/hddfancontrol
hddfancontrol: init at 1.5.1 (plus nixos module)
This commit is contained in:
commit
5b198578db
@ -20,6 +20,8 @@
|
|||||||
|
|
||||||
- [mautrix-whatsapp](https://docs.mau.fi/bridges/go/whatsapp/index.html) A Matrix-WhatsApp puppeting bridge
|
- [mautrix-whatsapp](https://docs.mau.fi/bridges/go/whatsapp/index.html) A Matrix-WhatsApp puppeting bridge
|
||||||
|
|
||||||
|
- [hddfancontrol](https://github.com/desbma/hddfancontrol), a service to regulate fan speeds based on hard drive temperature. Available as [services.hddfancontrol](#opt-services.hddfancontrol.enable).
|
||||||
|
|
||||||
- [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable).
|
- [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable).
|
||||||
|
|
||||||
- [Typesense](https://github.com/typesense/typesense), a fast, typo-tolerant search engine for building delightful search experiences. Available as [services.typesense](#opt-services.typesense.enable).
|
- [Typesense](https://github.com/typesense/typesense), a fast, typo-tolerant search engine for building delightful search experiences. Available as [services.typesense](#opt-services.typesense.enable).
|
||||||
|
@ -505,6 +505,7 @@
|
|||||||
./services/hardware/fancontrol.nix
|
./services/hardware/fancontrol.nix
|
||||||
./services/hardware/freefall.nix
|
./services/hardware/freefall.nix
|
||||||
./services/hardware/fwupd.nix
|
./services/hardware/fwupd.nix
|
||||||
|
./services/hardware/hddfancontrol.nix
|
||||||
./services/hardware/illum.nix
|
./services/hardware/illum.nix
|
||||||
./services/hardware/interception-tools.nix
|
./services/hardware/interception-tools.nix
|
||||||
./services/hardware/irqbalance.nix
|
./services/hardware/irqbalance.nix
|
||||||
|
67
nixos/modules/services/hardware/hddfancontrol.nix
Normal file
67
nixos/modules/services/hardware/hddfancontrol.nix
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.hddfancontrol;
|
||||||
|
types = lib.types;
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
options = {
|
||||||
|
|
||||||
|
services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon";
|
||||||
|
|
||||||
|
services.hddfancontrol.disks = lib.mkOption {
|
||||||
|
type = with types; listOf path;
|
||||||
|
default = [];
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Drive(s) to get temperature from
|
||||||
|
'';
|
||||||
|
example = ["/dev/sda"];
|
||||||
|
};
|
||||||
|
|
||||||
|
services.hddfancontrol.pwmPaths = lib.mkOption {
|
||||||
|
type = with types; listOf path;
|
||||||
|
default = [];
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
PWM filepath(s) to control fan speed (under /sys)
|
||||||
|
'';
|
||||||
|
example = ["/sys/class/hwmon/hwmon2/pwm1"];
|
||||||
|
};
|
||||||
|
|
||||||
|
services.hddfancontrol.smartctl = lib.mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Probe temperature using smartctl instead of hddtemp or hdparm
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
services.hddfancontrol.extraArgs = lib.mkOption {
|
||||||
|
type = with types; listOf str;
|
||||||
|
default = [];
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Extra commandline arguments for hddfancontrol
|
||||||
|
'';
|
||||||
|
example = ["--pwm-start-value=32"
|
||||||
|
"--pwm-stop-value=0"
|
||||||
|
"--spin-down-time=900"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable (
|
||||||
|
let args = lib.concatLists [
|
||||||
|
["-d"] cfg.disks
|
||||||
|
["-p"] cfg.pwmPaths
|
||||||
|
(lib.optional cfg.smartctl "--smartctl")
|
||||||
|
cfg.extraArgs
|
||||||
|
]; in {
|
||||||
|
systemd.packages = [pkgs.hddfancontrol];
|
||||||
|
|
||||||
|
systemd.services.hddfancontrol = {
|
||||||
|
enable = true;
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
environment.HDDFANCONTROL_ARGS = lib.escapeShellArgs args;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
@ -341,6 +341,7 @@ in {
|
|||||||
hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; };
|
hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; };
|
||||||
hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; };
|
hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; };
|
||||||
hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; };
|
hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; };
|
||||||
|
hddfancontrol = handleTest ./hddfancontrol.nix {};
|
||||||
hedgedoc = handleTest ./hedgedoc.nix {};
|
hedgedoc = handleTest ./hedgedoc.nix {};
|
||||||
herbstluftwm = handleTest ./herbstluftwm.nix {};
|
herbstluftwm = handleTest ./herbstluftwm.nix {};
|
||||||
homepage-dashboard = handleTest ./homepage-dashboard.nix {};
|
homepage-dashboard = handleTest ./homepage-dashboard.nix {};
|
||||||
|
44
nixos/tests/hddfancontrol.nix
Normal file
44
nixos/tests/hddfancontrol.nix
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||||
|
name = "hddfancontrol";
|
||||||
|
meta = with pkgs.lib.maintainers; {
|
||||||
|
maintainers = [ benley ];
|
||||||
|
};
|
||||||
|
|
||||||
|
nodes.machine = { ... }: {
|
||||||
|
imports = [ ../modules/profiles/minimal.nix ];
|
||||||
|
|
||||||
|
services.hddfancontrol.enable = true;
|
||||||
|
services.hddfancontrol.disks = ["/dev/vda"];
|
||||||
|
services.hddfancontrol.pwmPaths = ["/test/hwmon1/pwm1"];
|
||||||
|
services.hddfancontrol.extraArgs = ["--pwm-start-value=32"
|
||||||
|
"--pwm-stop-value=0"];
|
||||||
|
|
||||||
|
systemd.services.hddfancontrol_fixtures = {
|
||||||
|
description = "Install test fixtures for hddfancontrol";
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
};
|
||||||
|
script = ''
|
||||||
|
mkdir -p /test/hwmon1
|
||||||
|
echo 255 > /test/hwmon1/pwm1
|
||||||
|
echo 2 > /test/hwmon1/pwm1_enable
|
||||||
|
'';
|
||||||
|
wantedBy = ["hddfancontrol.service"];
|
||||||
|
before = ["hddfancontrol.service"];
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.hddfancontrol.serviceConfig.ReadWritePaths = "/test";
|
||||||
|
};
|
||||||
|
|
||||||
|
# hddfancontrol.service will fail to start because qemu /dev/vda doesn't have
|
||||||
|
# any thermal interfaces, but it should ensure that fans appear to be running
|
||||||
|
# before it aborts.
|
||||||
|
testScript = ''
|
||||||
|
start_all()
|
||||||
|
machine.wait_for_unit("multi-user.target")
|
||||||
|
machine.succeed("journalctl -eu hddfancontrol.service|grep 'Setting fan speed'")
|
||||||
|
machine.shutdown()
|
||||||
|
|
||||||
|
'';
|
||||||
|
|
||||||
|
})
|
34
pkgs/tools/system/hddfancontrol/default.nix
Normal file
34
pkgs/tools/system/hddfancontrol/default.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ lib, python3Packages, fetchFromGitHub, hddtemp, hdparm, smartmontools }:
|
||||||
|
|
||||||
|
python3Packages.buildPythonPackage rec {
|
||||||
|
pname = "hddfancontrol";
|
||||||
|
version = "1.5.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "desbma";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "0b2grf98qnikayn18xll01dkm5pjpcjxdffgx1nyw9s0gqig8dg0";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
python3Packages.python-daemon
|
||||||
|
hddtemp
|
||||||
|
hdparm
|
||||||
|
smartmontools
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mkdir -p $out/etc/systemd/system
|
||||||
|
substitute systemd/hddfancontrol.service $out/etc/systemd/system/hddfancontrol.service \
|
||||||
|
--replace /usr/bin/hddfancontrol $out/bin/hddfancontrol
|
||||||
|
sed -i -e '/EnvironmentFile=.*/d' $out/etc/systemd/system/hddfancontrol.service
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Dynamically control fan speed according to hard drive temperature on Linux";
|
||||||
|
homepage = "https://github.com/desbma/hddfancontrol";
|
||||||
|
license = licenses.gpl3;
|
||||||
|
maintainers = with maintainers; [ benley ];
|
||||||
|
};
|
||||||
|
}
|
@ -9032,6 +9032,8 @@ with pkgs;
|
|||||||
|
|
||||||
hdaps-gl = callPackage ../tools/misc/hdaps-gl { };
|
hdaps-gl = callPackage ../tools/misc/hdaps-gl { };
|
||||||
|
|
||||||
|
hddfancontrol = callPackage ../tools/system/hddfancontrol { };
|
||||||
|
|
||||||
hddtemp = callPackage ../tools/misc/hddtemp { };
|
hddtemp = callPackage ../tools/misc/hddtemp { };
|
||||||
|
|
||||||
hdf4 = callPackage ../tools/misc/hdf4 { };
|
hdf4 = callPackage ../tools/misc/hdf4 { };
|
||||||
|
Loading…
Reference in New Issue
Block a user