coolercontrol.{coolercontrold,coolercontrol-ui-data,coolercontrol-gui}: 3.1.1 -> 4.0.1

pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix

@@ -11,7 +11,8 @@ buildNpmPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrol-ui";
 
-  npmDepsHash = "sha256-crkAK9k7wwbjiAQGBK584/29Zi0TZlljuASdvni8RkQ=";
+  npmDepsFetcherVersion = 2;
+  npmDepsHash = "sha256-NmTNaHm7NGkNWnNbTfLC9/3cSJRR+ir1YS+ot4MJNog=";
 
   postBuild = ''
     cp -r dist $out

pkgs/applications/system/coolercontrol/coolercontrold.nix

@@ -1,6 +1,7 @@
 {
   rustPlatform,
   testers,
+  hwdata,
   libdrm,
   coolercontrol,
   runtimeShell,
@@ -21,7 +22,7 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  cargoHash = "sha256-5YYodScAAs6ERVbj+irvyNS9IOkVaBHR4DCXTrrtyVI=";
+  cargoHash = "sha256-i6QYJ2kVXpYVbGyY/5EeGbCVCkxLeqf1mgvrXKRdup0=";
 
   buildInputs = [ libdrm ];
 
@@ -39,8 +40,12 @@ rustPlatform.buildRustPackage {
     cp -R ${coolercontrol.coolercontrol-ui-data}/* resources/app/
 
     # Hardcode a shell
-    substituteInPlace src/repositories/utils.rs \
+    substituteInPlace daemon/src/repositories/utils.rs \
       --replace-fail 'Command::new("sh")' 'Command::new("${runtimeShell}")'
+
+    # This is supposed to be a "nix-compatible file path", but there is nothing that actually does the substitution
+    substituteInPlace ../../coolercontrold-${version}-vendor/pciid-parser-*/src/lib.rs \
+      --replace-fail '@hwdata@' '${hwdata}'
   '';
 
   postInstall = ''

pkgs/applications/system/coolercontrol/default.nix

@@ -5,13 +5,13 @@
 }:
 
 let
-  version = "3.1.1";
+  version = "4.0.1";
 
   src = fetchFromGitLab {
     owner = "coolercontrol";
     repo = "coolercontrol";
-    rev = version;
-    hash = "sha256-ocGW55z/cbO7uXWxiHoE798hN56fLlSgmZkO507eruY=";
+    tag = version;
+    hash = "sha256-X8KEZARksSwmFEKnGnwZk9aQ0ND6fOsSelCIWPkEjN8=";
   };
 
   meta = {