coolercontrol.*: 1.4.0 -> 1.4.4 (#358289)

pkgs/applications/system/coolercontrol/coolercontrol-gui.nix

@@ -1,20 +1,22 @@
-{ lib
-, rustPlatform
-, dbus
-, freetype
-, gtk3
-, libsoup_3
-, openssl
-, pkg-config
-, webkitgtk_4_1
-, libappindicator
-, makeWrapper
-, coolercontrol
+{
+  lib,
+  rustPlatform,
+  dbus,
+  freetype,
+  gtk3,
+  libsoup_3,
+  openssl,
+  pkg-config,
+  webkitgtk_4_1,
+  libappindicator,
+  makeWrapper,
+  coolercontrol,
 }:
 
-{ version
-, src
-, meta
+{
+  version,
+  src,
+  meta,
 }:
 
 rustPlatform.buildRustPackage {
@@ -22,7 +24,7 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrol-ui/src-tauri";
 
-  cargoHash = "sha256-0Ud5S4T5+5eBuvD5N64NAvbK0+tTozKsPhsNziCEu3I=";
+  cargoHash = "sha256-nS67ABuI2/C08X+TWWoOx7bptIPF1fsvBC1Ucoky1/4=";
 
   buildFeatures = [ "custom-protocol" ];
 
@@ -48,7 +50,7 @@ rustPlatform.buildRustPackage {
   postPatch = ''
     mkdir -p ui-build
     cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/
-    substituteInPlace tauri.conf.json --replace '"frontendDist": "../dist"' '"frontendDist": "ui-build"'
+    substituteInPlace tauri.conf.json --replace-fail '"frontendDist": "../dist"' '"frontendDist": "ui-build"'
   '';
 
   postInstall = ''

pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix

@@ -1,9 +1,9 @@
-{ python3
-}:
+{ python3 }:
 
-{ version
-, src
-, meta
+{
+  version,
+  src,
+  meta,
 }:
 
 python3.pkgs.buildPythonApplication {
@@ -12,9 +12,7 @@ python3.pkgs.buildPythonApplication {
   sourceRoot = "${src.name}/coolercontrol-liqctld";
   format = "pyproject";
 
-  nativeBuildInputs = with python3.pkgs; [
-    setuptools
-  ];
+  nativeBuildInputs = with python3.pkgs; [ setuptools ];
 
   propagatedBuildInputs = with python3.pkgs; [
     liquidctl
@@ -26,7 +24,7 @@ python3.pkgs.buildPythonApplication {
   postInstall = ''
     install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system"
     substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \
-      --replace '/usr/bin' "$out/bin"
+      --replace-fail '/usr/bin' "$out/bin"
   '';
 
   meta = meta // {

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

@@ -1,9 +1,9 @@
-{ buildNpmPackage
-}:
+{ buildNpmPackage, autoPatchelfHook }:
 
-{ version
-, src
-, meta
+{
+  version,
+  src,
+  meta,
 }:
 
 buildNpmPackage {
@@ -11,7 +11,15 @@ buildNpmPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrol-ui";
 
-  npmDepsHash = "sha256-PpX9lk+yEG1auvBv5JBdMh7rjWoM0oTYJx6Nme5ij8s=";
+  npmDepsHash = "sha256-j+bGOGIG9H/1z0dN8BfvWSi6gPvYmCV7l0ZNH8h3yeU=";
+
+  preBuild = ''
+    autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart
+  '';
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+
+  dontAutoPatchelf = true;
 
   postBuild = ''
     cp -r dist $out

pkgs/applications/system/coolercontrol/coolercontrold.nix

@@ -1,13 +1,15 @@
-{ rustPlatform
-, testers
-, libdrm
-, coolercontrol
-, runtimeShell
+{
+  rustPlatform,
+  testers,
+  libdrm,
+  coolercontrol,
+  runtimeShell,
 }:
 
-{ version
-, src
-, meta
+{
+  version,
+  src,
+  meta,
 }:
 
 rustPlatform.buildRustPackage {
@@ -15,22 +17,16 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "nvml-wrapper-0.10.0" = "sha256-pMiULWT+nJXcDfLDeACG/DaPF5+AbzpoIUWWWz8mQ+0=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-ZAjaegUgNkKygXqskyeUkWpcqi1Jt7pE8GtqWlaP6/I=";
 
-  buildInputs = [
-    libdrm
-  ];
+  buildInputs = [ libdrm ];
 
   postPatch = ''
     # copy the frontend static resources to a directory for embedding
     mkdir -p ui-build
     cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/
-    substituteInPlace build.rs --replace '"./resources/app"' '"./ui-build"'
+    substituteInPlace build.rs --replace-fail '"./resources/app"' '"./ui-build"'
 
     # Hardcode a shell
     substituteInPlace src/repositories/utils.rs \
@@ -40,7 +36,7 @@ rustPlatform.buildRustPackage {
   postInstall = ''
     install -Dm444 "${src}/packaging/systemd/coolercontrold.service" -t "$out/lib/systemd/system"
     substituteInPlace "$out/lib/systemd/system/coolercontrold.service" \
-      --replace '/usr/bin' "$out/bin"
+      --replace-fail '/usr/bin' "$out/bin"
   '';
 
   passthru.tests.version = testers.testVersion {

pkgs/applications/system/coolercontrol/default.nix

@@ -1,24 +1,28 @@
-{ lib
-, fetchFromGitLab
-, callPackage
+{
+  lib,
+  fetchFromGitLab,
+  callPackage,
 }:
 
 let
-  version = "1.4.0";
+  version = "1.4.4";
 
   src = fetchFromGitLab {
     owner = "coolercontrol";
     repo = "coolercontrol";
     rev = version;
-    hash = "sha256-jsgso9MHt5Szzp9YkuXz8qysdN0li/zD2R/vSZ2Lw5M=";
+    hash = "sha256-9l10X4uDv3KJz582QQMhqh38bwDtQVHm9HdAVNC6Kfg=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Monitor and control your cooling devices";
     homepage = "https://gitlab.com/coolercontrol/coolercontrol";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ codifryed OPNA2608 ];
+    maintainers = with lib.maintainers; [
+      codifryed
+      OPNA2608
+    ];
   };
 
   applySharedDetails = drv: drv { inherit version src meta; };