From 11cad9233f640ddd0a05fc60cb9b194fad95acc6 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 5 Feb 2024 13:28:16 +0100 Subject: [PATCH 1/2] Don't override handheld-daemon package in common --- machines/WinMax2/configuration.nix | 9 +++++++++ roles/common/configuration.nix | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index 1b8ddc8..6d231c1 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -47,6 +47,15 @@ ACTION=="add", SUBSYSTEM=="i2c", ATTR{name}=="PNP0C50:00", ATTR{power/wakeup}="d ''; services.handheld-daemon = { + package = pkgs.handheld-daemon.overridePythonAttrs { + src = pkgs.fetchFromGitHub { + owner = "hhd-dev"; + repo = "hhd"; + rev = "c074cb0e3e13ab18fd150eb36df70044ede45038"; + hash = "sha256-Jzx72d1l7v6d/fgPvj3BwAF/hgXL4MWzhPjKvtdqwfw="; + }; + version = "1.1.4"; + }; enable = true; user = "root"; }; diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix index f129e53..9caaeb9 100755 --- a/roles/common/configuration.nix +++ b/roles/common/configuration.nix @@ -82,15 +82,6 @@ "grub" ]; }; - handheld-daemon = prev.handheld-daemon.overridePythonAttrs { - src = pkgs.fetchFromGitHub { - owner = "hhd-dev"; - repo = "hhd"; - rev = "c074cb0e3e13ab18fd150eb36df70044ede45038"; - hash = "sha256-Jzx72d1l7v6d/fgPvj3BwAF/hgXL4MWzhPjKvtdqwfw="; - }; - version = "1.1.4"; - }; } ) ]; From fcb0ecb3df23881308bf7c261db61a740e281c34 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 5 Feb 2024 14:03:13 +0100 Subject: [PATCH 2/2] Machines/WinMax2: update handheld-daemon --- machines/WinMax2/configuration.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index 6d231c1..9eb4f06 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -47,14 +47,14 @@ ACTION=="add", SUBSYSTEM=="i2c", ATTR{name}=="PNP0C50:00", ATTR{power/wakeup}="d ''; services.handheld-daemon = { - package = pkgs.handheld-daemon.overridePythonAttrs { + package = pkgs.handheld-daemon.overridePythonAttrs rec{ src = pkgs.fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; - rev = "c074cb0e3e13ab18fd150eb36df70044ede45038"; - hash = "sha256-Jzx72d1l7v6d/fgPvj3BwAF/hgXL4MWzhPjKvtdqwfw="; + rev = "v${version}"; + hash = "sha256-avlQNo2Q2AAEefwZs14fzMDuWYrj9bn9zQ18IMlmxJU="; }; - version = "1.1.4"; + version = "1.3.3"; }; enable = true; user = "root";