Merge pull request #105745 from archseer/thermald-2-4
commitc1695ade0b3d63241a718f2d3293cfcdf73c7143
authorSandro <sandro.jaeckel@gmail.com>
dateThu 3 Dec 2020, 11:26 (6 years ago)
parentf3bc692873be87
maintainers/maintainer-list.nix+6
@@ -652,6 +652,12 @@
652652 githubId = 56009;
653653 name = "Arcadio Rubio García";
654654 };
655+ archseer = {
656+ email = "blaz@mxxn.io";
657+ github = "archseer";
658+ githubId = 1372918;
659+ name = "Blaž Hrastnik";
660+ };
655661 arcnmx = {
656662 email = "arcnmx@users.noreply.github.com";
657663 github = "arcnmx";
nixos/modules/services/hardware/thermald.nix+1−10
@@ -23,15 +23,6 @@ in {
2323 default = null;
2424 description = "the thermald manual configuration file.";
2525 };
26−
27− adaptive = mkOption {
28− type = types.bool;
29− default = false;
30− description = ''
31− Whether to enable adaptive mode, only working on kernel versions greater than 5.8.
32− Thermald will detect this itself, safe to enable on kernel versions below 5.8.
33− '';
34− };
3526 };
3627 };
3728
@@ -48,8 +39,8 @@ in {
4839 --no-daemon \
4940 ${optionalString cfg.debug "--loglevel=debug"} \
5041 ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
51− ${optionalString cfg.adaptive "--adaptive"} \
5242 --dbus-enable
43+ --adaptive
5344 '';
5445 };
5546 };
pkgs/tools/system/thermald/default.nix+2−2
@@ -18,7 +18,7 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "thermald";
21− version = "2.3";
21+ version = "2.4.1";
2222
2323 outputs = [ "out" "devdoc" ];
2424
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 owner = "intel";
2727 repo = "thermal_daemon";
2828 rev = "v${version}";
29− sha256 = "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl";
29+ sha256 = "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6";
3030 };
3131
3232 nativeBuildInputs = [