From patchwork Sun Jan 12 23:05:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 37004 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7C86F27BBEA; Sun, 12 Jan 2025 23:06:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF65427BBE2 for ; Sun, 12 Jan 2025 23:06:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tX71y-0002w6-Eu; Sun, 12 Jan 2025 18:06:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tX71u-0002vi-JU for guix-patches@gnu.org; Sun, 12 Jan 2025 18:06:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tX71u-0002y2-1N for guix-patches@gnu.org; Sun, 12 Jan 2025 18:06:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=8arUhCTIEfKS5sUBGE78PjcT3F1AruEAs+UyK+GtGZU=; b=TzlfAiYi48SAcvWGmNdmLTOT2k5ZGKySAYKAFQFI/dpuPmtklaP5124t9R1xiK/AUirAkDLF14DcdlVVBKpGgYLT78aCIanXrjBdXEuAgJwkdCOOlME998Jq7ghS7t31qpsJJU/mnriO2GpOelwJY19KqONrdPAaa/HrbksOXWAIDoOiyvpEUnTgf8vp7jtGRu8XZfM24MESOHndfFwHY7oq5jF/rhDU/l4B0lVQkb6IrLCIPEmV3SamlQZ8j0DqDnvIV2byJQz37JIIK98kj5Q+289FdPGyycwWIt4gvFAXAxG811HTc0p8lQZVeEsfcdzuEx2FRRwXmIQ+7h94/A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tX71t-00079I-SJ for guix-patches@gnu.org; Sun, 12 Jan 2025 18:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75528] [PATCH 1/2] gnu: Add apcupsd. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Jan 2025 23:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75528 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75528@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 75528-submit@debbugs.gnu.org id=B75528.173672313227428 (code B ref 75528); Sun, 12 Jan 2025 23:06:01 +0000 Received: (at 75528) by debbugs.gnu.org; 12 Jan 2025 23:05:32 +0000 Received: from localhost ([127.0.0.1]:49448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tX71P-00078J-K4 for submit@debbugs.gnu.org; Sun, 12 Jan 2025 18:05:32 -0500 Received: from wolfsden.cz ([37.205.8.62]:59848) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tX71M-000788-7L for 75528@debbugs.gnu.org; Sun, 12 Jan 2025 18:05:29 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id D6036342C1D; Sun, 12 Jan 2025 23:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1736723126; bh=p0bKALsrwxfPOLQkolSwo4qZhiRU8Etm+n76/Meke8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RP/2ORxPaEdcQtl5WsjLev/9oB93Wj+tosAyE3GrT7P+DAW0JU8VafZrtTQVf1ek3 yIohgWmHB30Whu/ktIMLV4D8zBevNCgTGOt2FWPiowzmLkDDem7b39srggfm8bCSyX XLeCZs0Yc9Oy+kbALrfTuNXUeVuujz0+f5G9UjUwgLDLOk9UcHf4CYV/kJDQ3t8L1P EfG0AbuewzQXzxTqSVNjW555nFt1hPxnG6lZnAc0A+HJvmXw5VwZFOA9EtNMyQCtT+ fFyYbMv3fc6BBC0wjGD6pJNPOGyaGSxO1TE6wQduGCeo8Ss5HyZK4WW27K+onmC25a +XFcFeRMAZIOu/f23ySxsqzWFNP8lSJdYVGLbE1O4bq0Arn5zm7KHGbQ/dVAVYrfg9 2YebP1qHQ6ie+AWORu2t7oMPbDgdVUtwz9HXGBqZ0HRe9odWV423E3P8yD2KF4MQq4 mmVo4jX1r2V4ywK5kQ3LmGQQPQTSTBGeVrsUq0Mfo51jiSJe7ocbo6uuWHgYeuRKEI scKnPbbvWubV6jk1U8FPdQuic+5fOQrJl6q/dcgR99OCMC9yloNaCeMvjTGs4aUYF7 AKHH5m18LUT8M0TaC22nU6Wj9ODDG+fK2AB16iBFDBA1fno1VBQ0rMN1SmBReCSvC5 Dslcb/ucoesb1Ui3ez3RLxns= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id F2D12341673; Sun, 12 Jan 2025 23:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1736723126; bh=p0bKALsrwxfPOLQkolSwo4qZhiRU8Etm+n76/Meke8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RP/2ORxPaEdcQtl5WsjLev/9oB93Wj+tosAyE3GrT7P+DAW0JU8VafZrtTQVf1ek3 yIohgWmHB30Whu/ktIMLV4D8zBevNCgTGOt2FWPiowzmLkDDem7b39srggfm8bCSyX XLeCZs0Yc9Oy+kbALrfTuNXUeVuujz0+f5G9UjUwgLDLOk9UcHf4CYV/kJDQ3t8L1P EfG0AbuewzQXzxTqSVNjW555nFt1hPxnG6lZnAc0A+HJvmXw5VwZFOA9EtNMyQCtT+ fFyYbMv3fc6BBC0wjGD6pJNPOGyaGSxO1TE6wQduGCeo8Ss5HyZK4WW27K+onmC25a +XFcFeRMAZIOu/f23ySxsqzWFNP8lSJdYVGLbE1O4bq0Arn5zm7KHGbQ/dVAVYrfg9 2YebP1qHQ6ie+AWORu2t7oMPbDgdVUtwz9HXGBqZ0HRe9odWV423E3P8yD2KF4MQq4 mmVo4jX1r2V4ywK5kQ3LmGQQPQTSTBGeVrsUq0Mfo51jiSJe7ocbo6uuWHgYeuRKEI scKnPbbvWubV6jk1U8FPdQuic+5fOQrJl6q/dcgR99OCMC9yloNaCeMvjTGs4aUYF7 AKHH5m18LUT8M0TaC22nU6Wj9ODDG+fK2AB16iBFDBA1fno1VBQ0rMN1SmBReCSvC5 Dslcb/ucoesb1Ui3ez3RLxns= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 13 Jan 2025 00:05:13 +0100 Message-ID: <51cba7679af5c4aa9cf0e6d70453e369ff0909d6.1736722765.git.~@wolfsden.cz> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/power.scm (apcupsd): New variable. Change-Id: I74f59cd1fa2a13954117ff1683a10a84576cc839 --- gnu/local.mk | 1 + gnu/packages/power.scm | 125 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 gnu/packages/power.scm diff --git a/gnu/local.mk b/gnu/local.mk index 855f2acccc..6ca7bf68ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -557,6 +557,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/polkit.scm \ %D%/packages/popt.scm \ %D%/packages/potassco.scm \ + %D%/packages/power.scm \ %D%/packages/printers.scm \ %D%/packages/profiling.scm \ %D%/packages/prolog.scm \ diff --git a/gnu/packages/power.scm b/gnu/packages/power.scm new file mode 100644 index 0000000000..98dc98c6e4 --- /dev/null +++ b/gnu/packages/power.scm @@ -0,0 +1,125 @@ +;;; Copyright (C) 2025 Tomas Volf <~@wolfsden.cz> +;;; Copyright (C) 2023 Raven Hallsby + +;;;; Commentary: + +;;; Power-related packages. + +;;;; Code: + +(define-module (gnu packages power) + #:use-module (gnu) + #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public apcupsd + (package + (name "apcupsd") + (version "3.14.14") + (source (origin + (method url-fetch) + (uri + (string-append + "mirror://sourceforge/" name "/" name " - Stable/" version + "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv")))) + (native-inputs + (list pkg-config python-docutils)) + (inputs + (list libusb libusb-compat)) + (outputs '("out" "doc")) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; The configure script ignores --prefix for most of the paths. + (string-append "--exec-prefix=" #$output) + (string-append "--mandir=" #$output "/share/man") + (string-append "--sbindir=" #$output "/sbin") + (string-append "--sysconfdir=" #$output "/etc/apcupsd") + (string-append "--with-halpolicydir=" #$output "/share/halpolicy") + + ;; Put us into the version string. + "--with-distname=GNU/Guix" + "--disable-install-distdir" + + ;; State directories. + "--localstatedir=/var" + "--with-log-dir=/var/log" + "--with-pid-dir=/var/run" + "--with-lock-dir=/var/run/apcupsd/lock" + "--with-nologin=/var/run/apcupsd" + "--with-pwrfail-dir=/var/run/apcupsd" + + ;; Configure requires these, but we do not use the genenerated + ;; apcupsd.conf, so in order to reduce dependencies of the package, + ;; provide fake values. + (string-append "ac_cv_path_SHUTDOWN=/nope") + (string-append "ac_cv_path_APCUPSD_MAIL=/nope") + ;; While `wall' is not expanded anywhere, it still is searched for. + (string-append "ac_cv_path_WALL=/nope") + + ;; Enable additional drivers. + "--enable-test" + "--enable-usb" + "--enable-modbus-usb") + #:tests? #f ; There are no tests. + #:modules (cons '(ice-9 ftw) %default-gnu-modules) + #:phases + #~(modify-phases %standard-phases + ;; These are not installed, so trick Make into thinking they were + ;; already generated. Allows us not to depend on mandoc, util-linux. + (add-before 'configure 'touch-txt-docs + (lambda _ + (for-each (lambda (f) + (call-with-output-file f close-port)) + '("doc/apcupsd.man.txt" + "doc/apcaccess.man.txt" + "doc/apctest.man.txt" + "doc/apccontrol.man.txt" + "doc/apcupsd.conf.man.txt")))) + (add-after 'build 'build-manual + (lambda _ + (invoke "make" "-C" "doc/manual" "manual.html"))) + (add-after 'install-license-files 'move-doc + (lambda _ + (let ((target (string-append #$output:doc + "/share/doc/" + (strip-store-file-name #$output)))) + (mkdir-p target) + (for-each (lambda (f) + (copy-file (string-append "doc/manual/" f) + (string-append target "/" f))) + (scandir "doc/manual" + (lambda (f) + (or (string-suffix? ".png" f) + (string-suffix? ".html" f)))))))) + ;; If sending mails is required, use proper mail program. + (add-after 'install 'remove-smtp + (lambda _ + (delete-file (string-append #$output "/sbin/smtp")))) + ;; The configuration files and scripts are not really suitable for + ;; Guix, and our service provides its own version anyway. So nuke + ;; these to make sure `apcupsd' and `apctest' executed without any + ;; arguments fail. `apctest' actually segfaults, but only after + ;; printing an error ¯\_(ツ)_/¯. + (add-after 'install 'remove-etc-apcupsd + (lambda _ + (delete-file-recursively (string-append #$output "/etc/apcupsd"))))))) + (home-page "https://www.apcupsd.org") + (synopsis "A daemon for controlling APC UPSes") + (description "Apcupsd can be used for power mangement and controlling most +of APC’s UPS models on Unix and Windows machines. Apcupsd works with most of +APC’s Smart-UPS models as well as most simple signalling models such a Back-UPS, +and BackUPS-Office.") + (license license:gpl2)))