From 2095eae5ce6909d25c4593b356c20ee47faa198b Mon Sep 17 00:00:00 2001 From: Matthew Toohey Date: Sat, 28 Sep 2024 20:29:14 -0400 Subject: [PATCH] fan2go: 0.8.1 -> 0.9.0 --- pkgs/os-specific/linux/fan2go/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/os-specific/linux/fan2go/default.nix index edd44842eed9..296bfea58069 100644 --- a/pkgs/os-specific/linux/fan2go/default.nix +++ b/pkgs/os-specific/linux/fan2go/default.nix @@ -1,21 +1,26 @@ -{ buildGoModule, fetchFromGitHub, lib, lm_sensors }: +{ buildGo123Module, fetchFromGitHub, lib, lm_sensors }: -buildGoModule rec { +buildGo123Module rec { pname = "fan2go"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "markusressel"; repo = pname; rev = version; - hash = "sha256-w2Qwu3ZmBkoA86xa7V6pnIBAbfG9mtkAHePkQjefRW8="; + hash = "sha256-eSHeHBzDvzsDAck0zexwR8drasisvlQNTeowv92E2uc="; }; - vendorHash = "sha256-6OEdl7ie0dTjXrG//Fvcg4ZyTW/mhrUievDljY2zi/4="; + vendorHash = "sha256-ad0e/cxbcU/KfPDOdD46KdCcvns83dgGDAyLLQiGyiA="; postConfigure = '' substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \ - --replace '"/etc/sensors3.conf"' '"${lm_sensors}/etc/sensors3.conf"' + --replace-fail '"/etc/sensors3.conf"' '"${lm_sensors}/etc/sensors3.conf"' + + # Uses /usr/bin/echo, and even if we patch that, it refuses to execute any + # binary without being able to confirm that it's owned by root, which isn't + # possible under the sandbox. + rm internal/fans/cmd_test.go ''; CGO_CFLAGS = "-I ${lm_sensors}/include";