Merge remote-tracking branch 'gum/master'

3 files changed, 85 insertions, 86 deletions

diff --git a/makefu/5pkgs/HermesLedControl/default.nix b/makefu/5pkgs/HermesLedControl/default.nix
new file mode 100644
index 000000000..88aed898d
--- /dev/null
+++ b/makefu/5pkgs/HermesLedControl/default.nix
@@ -0,0 +1,54 @@
+{ lib, pkgs, python3Packages, makeWrapper, ... }:
+
+# How to use:
+# create configuration .config/HermesLedControl/configuration.yml:
+#   engine: "rhasspy"
+#   pathToConfig: "/var/lib/rhasspy/de/profile.json"
+#   hardware: "respeaker4MicArray"
+#   pattern: "fake-name"
+#   enableDoA: false
+
+
+with python3Packages; buildPythonApplication rec {
+  name = "HermesLedControl-${version}";
+  format = "other";
+  version = "3.0.4";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "project-alice-assistant";
+    repo = "HermesLedControl";
+    rev = "v${version}";
+    hash = "sha256-fVbTQPSo3fNjLb8PDDDqhMC9Hez01rTH46cKz/mfwoU=";
+  };
+
+  patches = [
+    ./remove-logger.patch
+  ];
+
+  execWrapper = ''
+    #!/bin/sh
+    cd $out/lib/HermesLedControl && \
+      PYTHONPATH="${makePythonPath propagatedBuildInputs}" exec \
+        ${python}/bin/python  "$out/lib/HermesLedControl/main.py" "$@"
+  '';
+
+  installPhase = ''
+    install -d "$out/lib/"
+    install -d "$out/bin"
+    cp -r . $out/lib/HermesLedControl
+
+    echo "${execWrapper}" > HermesLedControl
+    install -Dm755 HermesLedControl $out/bin/HermesLedControl
+
+  '';
+
+  propagatedBuildInputs = [
+    spidev gpiozero rpi-gpio pyyaml paho-mqtt types-pyyaml makeWrapper
+  ];
+
+  meta = {
+    homepage = "https://github.com/project-alice-assistant/HermesLedControl";
+    description = "Provides an easy way to control your leds in an Hermes environment";
+    license = lib.licenses.gpl3;
+  };
+}
diff --git a/makefu/5pkgs/HermesLedControl/remove-logger.patch b/makefu/5pkgs/HermesLedControl/remove-logger.patch
new file mode 100644
index 000000000..a6b757d35
--- /dev/null
+++ b/makefu/5pkgs/HermesLedControl/remove-logger.patch
@@ -0,0 +1,31 @@
+diff --git a/main.py b/main.py
+old mode 100644
+new mode 100755
+index 9b5a269..350d443
+--- a/main.py
++++ b/main.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python3
+ from logging import handlers
+ 
+ import logging
+@@ -17,18 +18,6 @@ _logger.setLevel(logging.DEBUG)
+ 
+ date = int(datetime.now().strftime('%Y%m%d'))
+ 
+-handler = logging.FileHandler(filename='logs.log', mode='w')
+-rotatingHandler = handlers.RotatingFileHandler(filename=f'./logs/{date}-logs.log', mode='a', maxBytes=100000, backupCount=5)
+-streamHandler = logging.StreamHandler()
+-
+-handler.setFormatter(formatter)
+-rotatingHandler.setFormatter(formatter)
+-streamHandler.setFormatter(formatter)
+-
+-_logger.addHandler(handler)
+-_logger.addHandler(rotatingHandler)
+-_logger.addHandler(streamHandler)
+-
+ 
+ def stopHandler(_signum, frame):
+        onStop()
+
diff --git a/makefu/5pkgs/foomatic-db-engine/default.nix b/makefu/5pkgs/foomatic-db-engine/default.nix
deleted file mode 100644
index 242232c88..000000000
--- a/makefu/5pkgs/foomatic-db-engine/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, gd
-, libusb1
-, cups
-, libpng
-, perl
-, perlPackages
-, libxml2
-, ghostscript
-, a2ps
-, wget
-, file
-, foomatic-filters
-, makeWrapper
-}:
-
-stdenv.mkDerivation rec {
-  pname = "foomatic-db-engine";
-  version = "2020-01-31";
-
-  src = fetchFromGitHub {
-    owner = "OpenPrinting";
-    repo = "foomatic-db-engine-4";
-    rev = "bd265b77a9f66f672bf1e3f0803145f2eccabf06";
-    sha256 = "1f53kd3b0sxgx7hg2dvw2624bpwdfcx0zh4dn0h89l84mirgw1bs";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    perl
-    makeWrapper
-  ];
-  postConfigure = ''
-    sed -i "s#$ENV{BINDIR}#${placeholder "out"}/bin#" makeDefaults
-  '';
-  configureFlags = [
-    #"PERL_INSTALLDIRS=vendor"
-    "PERL_INSTALLDIRS=site"
-    "--prefix=/"
-    "PERLPREFIX=/"
-    #"DESTDIR=$(out)"
-    #"sysconfdir=/etc"
-    "LIBDIR=/lib"
-    #"PERL_INSTALLDIRS=site"
-    #"PERL_INSTALLDIRS=perl"
-    #PERL_INSTALLDIRS=perl"
-    "PERL=${perl}/bin/perl"
-    "FILEUTIL=${file}/bin/file"
-    "SBINDIR=/bin"
-  ];
-  makeFlags = [ 
-    "DESTDIR=${placeholder "out"}" 
-    "PERLLIB=$(out)/${perlPackages.perl.libPrefix}"
-  ];
-
-  buildInputs = [
-    cups
-    ghostscript
-    a2ps
-    wget
-    perl
-    libxml2
-    file
-    foomatic-filters
-  ];
-  postFixup = ''
-    echo cups > "$out"/etc/foomatic/defaultspooler
-
-    for file in $out/bin/foomatic-*;do
-        wrapProgram "$file" \
-          --set PERL5LIB "$out/${perlPackages.perl.libPrefix}" \
-          --prefix PATH : "$out/bin"
-    done
-
-  '';
-  
-  meta = with lib; {
-    description = "Command line tool to print labels on Brother P-Touch printers on Linux";
-    license = licenses.gpl3Plus;
-    homepage = "https://mockmoon-cybernetics.ch/computer/p-touch2430pc/";
-    maintainers = with maintainers; [ shamilton ];
-    platforms = platforms.linux;
-  };
-}