Merge pull request #105745 from archseer/thermald-2-4

This commit is contained in:
Sandro 2020-12-03 11:26:16 +01:00 committed by GitHub
commit c1695ade0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 12 deletions

View file

@ -652,6 +652,12 @@
githubId = 56009;
name = "Arcadio Rubio García";
};
archseer = {
email = "blaz@mxxn.io";
github = "archseer";
githubId = 1372918;
name = "Blaž Hrastnik";
};
arcnmx = {
email = "arcnmx@users.noreply.github.com";
github = "arcnmx";

View file

@ -23,15 +23,6 @@ in {
default = null;
description = "the thermald manual configuration file.";
};
adaptive = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable adaptive mode, only working on kernel versions greater than 5.8.
Thermald will detect this itself, safe to enable on kernel versions below 5.8.
'';
};
};
};
@ -48,8 +39,8 @@ in {
--no-daemon \
${optionalString cfg.debug "--loglevel=debug"} \
${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
${optionalString cfg.adaptive "--adaptive"} \
--dbus-enable
--adaptive
'';
};
};

View file

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "thermald";
version = "2.3";
version = "2.4.1";
outputs = [ "out" "devdoc" ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "thermal_daemon";
rev = "v${version}";
sha256 = "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl";
sha256 = "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6";
};
nativeBuildInputs = [