From ec026d26d2b26216d86b323b0c0cc4e5ccf87061 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Fri, 16 Sep 2022 22:19:18 +0000
Subject: [PATCH] usbrelay: 1.0 -> 1.0.1

---
 nixos/modules/services/hardware/usbrelayd.nix | 4 ----
 pkgs/os-specific/linux/usbrelay/daemon.nix    | 5 ++++-
 pkgs/os-specific/linux/usbrelay/default.nix   | 4 ++--
 pkgs/os-specific/linux/usbrelay/python.nix    | 4 ++++
 pkgs/os-specific/linux/usbrelay/test.nix      | 1 +
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hardware/usbrelayd.nix b/nixos/modules/services/hardware/usbrelayd.nix
index d45edb149c01..01d3a5ba8bee 100644
--- a/nixos/modules/services/hardware/usbrelayd.nix
+++ b/nixos/modules/services/hardware/usbrelayd.nix
@@ -34,10 +34,6 @@ in
 
     services.udev.packages = [ pkgs.usbrelayd ];
     systemd.packages = [ pkgs.usbrelayd ];
-    users.users.usbrelay = {
-      isSystemUser = true;
-      group = "usbrelay";
-    };
     users.groups.usbrelay = { };
   };
 
diff --git a/pkgs/os-specific/linux/usbrelay/daemon.nix b/pkgs/os-specific/linux/usbrelay/daemon.nix
index e5e4baae9e99..7aa1c3f153bb 100644
--- a/pkgs/os-specific/linux/usbrelay/daemon.nix
+++ b/pkgs/os-specific/linux/usbrelay/daemon.nix
@@ -1,4 +1,4 @@
-{ stdenv, usbrelay, python3 }:
+{ stdenv, usbrelay, python3, installShellFiles }:
 let
   python = python3.withPackages (ps: with ps; [ usbrelay-py paho-mqtt ]);
 in
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
       --replace '/usr/sbin/usbrelayd' "$out/bin/usbrelayd"
   '';
 
+  nativeBuildInputs = [ installShellFiles ];
+
   buildInputs = [ python ];
 
   dontBuild = true;
@@ -26,6 +28,7 @@ stdenv.mkDerivation rec {
     install -m 644 -D usbrelayd.service $out/lib/systemd/system/usbrelayd.service
     install -m 644 -D 50-usbrelay.rules $out/lib/udev/rules.d/50-usbrelay.rules
     install -m 644 -D usbrelayd.conf $out/etc/usbrelayd.conf # include this as an example
+    installManPage usbrelayd.8
     runHook postInstall
   '';
 
diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/os-specific/linux/usbrelay/default.nix
index 25388d3b2308..c5b4f2b8a53f 100644
--- a/pkgs/os-specific/linux/usbrelay/default.nix
+++ b/pkgs/os-specific/linux/usbrelay/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }:
 stdenv.mkDerivation rec {
   pname = "usbrelay";
-  version = "1.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "darrylb123";
     repo = "usbrelay";
     rev = version;
-    sha256 = "sha256-5zgpN4a+r0tmw0ISTJM+d9mo+L/qwUvpWPSsykuG0cg=";
+    sha256 = "sha256-2elDrO+WaaRYdTrG40Ez00qSsNVQjXE6GdOJbWPfugE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/usbrelay/python.nix b/pkgs/os-specific/linux/usbrelay/python.nix
index 02d5ac284eda..b87798940909 100644
--- a/pkgs/os-specific/linux/usbrelay/python.nix
+++ b/pkgs/os-specific/linux/usbrelay/python.nix
@@ -4,6 +4,10 @@ buildPythonPackage rec {
   pname = "usbrelay_py";
   inherit (usbrelay) version src;
 
+  preConfigure = ''
+    cd usbrelay_py
+  '';
+
   buildInputs = [ usbrelay ];
 
   pythonImportsCheck = [ "usbrelay_py" ];
diff --git a/pkgs/os-specific/linux/usbrelay/test.nix b/pkgs/os-specific/linux/usbrelay/test.nix
index dc5847558a69..58e4375dab8d 100644
--- a/pkgs/os-specific/linux/usbrelay/test.nix
+++ b/pkgs/os-specific/linux/usbrelay/test.nix
@@ -42,6 +42,7 @@ import ../../../../nixos/tests/make-test-python.nix ({ pkgs, ... }: {
   };
 
   testScript = ''
+    import os
     if os.waitstatus_to_exitcode(os.system("lsusb -d 16c0:05df")) != 0:
         print("No USB relay detected, skipping test")
         import sys