From e6e29d3c22d5c1729dc8dc63dfaf719855a2c6f9 Mon Sep 17 00:00:00 2001 From: Guy Boldon Date: Mon, 11 May 2026 20:54:24 +0200 Subject: [PATCH] coolercontrol: 4.1.0 -> 4.3.0 --- .../system/coolercontrol/coolercontrol-ui-data.nix | 2 +- .../system/coolercontrol/coolercontrold.nix | 13 +++++++------ pkgs/applications/system/coolercontrol/default.nix | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index c7dfa03f8617..4c8f093dd7f8 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -12,7 +12,7 @@ buildNpmPackage { sourceRoot = "${src.name}/coolercontrol-ui"; npmDepsFetcherVersion = 2; - npmDepsHash = "sha256-AzRw6DuloOFC7VN7yM9czqxosfVIoXAltv2xHUxac7k="; + npmDepsHash = "sha256-fWsksBQCwHHWYE82NG0Vf/f+Hk02YMCUaGMHFGhGx2U="; postBuild = '' cp -r dist $out diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index 1a2719cf0d34..01e7e4aecde4 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -2,6 +2,7 @@ rustPlatform, testers, hwdata, + pkg-config, libdrm, coolercontrol, runtimeShell, @@ -22,11 +23,15 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrold"; - cargoHash = "sha256-rFwbHsGkKLD9UgkdTbxMIjARmU0Ewal1NIwlbzRL/vc="; + cargoHash = "sha256-f0SsTwriUo2rD97L+Z/bq7UahOSLjYjH8bbXg/Hx5qE="; - buildInputs = [ libdrm ]; + buildInputs = [ + hwdata + libdrm + ]; nativeBuildInputs = [ + pkg-config protobuf addDriverRunpath python3Packages.wrapPython @@ -42,10 +47,6 @@ rustPlatform.buildRustPackage { # Hardcode a shell 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 daemon/src/repositories/hwmon/pci_ids.rs \ - --replace-fail '@hwdata@' '${hwdata}' ''; postInstall = '' diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 62e10a00710f..fe38f9bf98b1 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -5,13 +5,13 @@ }: let - version = "4.1.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "coolercontrol"; repo = "coolercontrol"; tag = version; - hash = "sha256-v1enPMezagA3gcYD5EbC1ecTOXEsMLRGWIKzgDxzRWg="; + hash = "sha256-hmxeqsCv0URBSe4sU637h4OYroLHQRcOtkFuyKoES7c="; }; meta = {