Update to main branch + switch to fw-ectool (TamtamHero#61)

* Adding @Svenum as an assignee to nix-related issues (TamtamHero#43) * Fixing adding @Svenum as an assignee to nix-related issues (TamtamHero#44) (non contributors cannot be assigned to issues) * Reload will report if config couldn't be parsed and the service keeps running. (TamtamHero#46) Authored-by: Nina Alexandra Klama <[email protected]> * Removing binary blobs from the project (TamtamHero#51) * removing binary blobs from the project. we now fetch the ectool from the gitlab artifacts and confirm the checksum. * remove bin references from README.md * extracting $TEMP_FOLDER from installEctool * Fix README spelling/grammer, fix "FrameWork" capitalization in service description (TamtamHero#52) * Review README spelling/grammar * Fix "FrameWork" capitalization in service * Clarify behaviour on service stop or pause (TamtamHero#53) (TamtamHero#55) * Separating FanController into different subclasses to allow HardwareController and SocketController diversity. 2 (Repost of TamtamHero#50) (TamtamHero#58) * separating `FanController` into different subclasses to allow `HardwareController` and `SocketController` diversity * adding the new arguments into the README.md * fixing an indentation error causing `--strategy <strategy>` not to work (the simple `<strategy>` still worked) * add fw-ectool in module * fixing missing print for command execution (TamtamHero#63) --------- Co-authored-by: Léopold Hubert <[email protected]> Co-authored-by: Nina Alexandra Klama <[email protected]> Co-authored-by: DeflateAwning <[email protected]>
Svenum · Aug 25, 2024 · 56b86fa · 56b86fa
1 parent 40f7b68
commit 56b86fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/nix/module.nix b/nix/module.nix
@@ -85,7 +85,7 @@ in
     # Install package
     environment.systemPackages = with pkgs; [
       fw-fanctrl
-      ectool
+      fw-ectool
     ];
 
     # Create config
@@ -101,7 +101,7 @@ in
         Type = "simple";
         Restart = "always";
         ExecStart = "${fw-fanctrl}/bin/fw-fanctrl --run --config /etc/fw-fanctrl/config.json --no-log";
-        ExecStopPost = "${pkgs.ectool}/bin/ectool autofanctrl";
+        ExecStopPost = "${pkgs.fw-ectool}/bin/ectool autofanctrl";
       };
       enable = true;
       wantedBy = [ "multi-user.target" ];

diff --git a/nix/packages/fw-fanctrl.nix b/nix/packages/fw-fanctrl.nix
@@ -5,7 +5,7 @@ python3,
 bash,
 callPackage,
 getopt,
-ectool
+fw-ectool
 }:
 
 let
@@ -46,7 +46,7 @@ python3Packages.buildPythonPackage rec{
   ];
 
   propagatedBuildInputs = [
-    ectool
+    fw-ectool
   ];
 
   doCheck = false;