From df65637e00e619462622bf73287bedfdc2490c2d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 17 Mar 2026 23:16:22 +0100 Subject: [PATCH] coolercontrol.{coolercontrold,coolercontrol-ui-data,coolercontrol-gui}: 3.1.1 -> 4.0.1 --- .../system/coolercontrol/coolercontrol-ui-data.nix | 3 ++- .../applications/system/coolercontrol/coolercontrold.nix | 9 +++++++-- pkgs/applications/system/coolercontrol/default.nix | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index 17aa677cb734..04dc724254ae 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/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 diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index e185235f4906..d6a6435ea382 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/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 = '' diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 0aa095f4f763..343f79d3c8c2 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/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 = {