From patchwork Tue Oct 27 16:12:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 24828 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 2776A27BBF2; Tue, 27 Oct 2020 16:13:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DB4F927BBF3 for ; Tue, 27 Oct 2020 16:13:08 +0000 (GMT) Received: from localhost ([::1]:42312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXRat-0004t1-Uy for patchwork@mira.cbaines.net; Tue, 27 Oct 2020 12:13:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXRao-0004ro-6a for guix-patches@gnu.org; Tue, 27 Oct 2020 12:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXRan-0007jL-S1 for guix-patches@gnu.org; Tue, 27 Oct 2020 12:13:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kXRan-0006fE-MO for guix-patches@gnu.org; Tue, 27 Oct 2020 12:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44258] Add Network UPS Tools Resent-From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Oct 2020 16:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44258@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160381516225587 (code B ref -1); Tue, 27 Oct 2020 16:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Oct 2020 16:12:42 +0000 Received: from localhost ([127.0.0.1]:45516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXRaP-0006eY-PP for submit@debbugs.gnu.org; Tue, 27 Oct 2020 12:12:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:58938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXRaN-0006eR-LZ for submit@debbugs.gnu.org; Tue, 27 Oct 2020 12:12:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXRaN-0004ia-Gb for guix-patches@gnu.org; Tue, 27 Oct 2020 12:12:35 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:38205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXRaK-0007hP-2k for guix-patches@gnu.org; Tue, 27 Oct 2020 12:12:35 -0400 Received: by mail-wr1-x436.google.com with SMTP id n18so2567521wrs.5 for ; Tue, 27 Oct 2020 09:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=bkKgaz073C6pfIBTewg/Fuu5z4jSBnnTmkl8sQ0aVG0=; b=rPRbywd/OvvRrN1nyLaHLdtQRqPBF7tf4OEgfbhBeFMN/CLOISjqppp/NhJWZ7qV0K omV/Ub0IATOaZXTQPux9wrCEiG5VgWE/5jI2/W5Wq+1dxgAxSXd3+fw0281W6yn8L0NR jbetDoC+PjJbF2wvfcUqSDni6C3Q6cIOgYsqFt/CGdcVEAfrAAsFex8kMLObiV07qXiU sHSqB/HT5NAZjNU2xBGfOoMcRCL+2whTlIB0mc/mNSPl1zVLVkwZiC/OfITdJhW5mucU xtu36Dt+jezwzPc2sneHV16KrguyTOGFB5ILPhdNI2cbiv8t5ve8WKRCWKzj3ZCumtck vWLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=bkKgaz073C6pfIBTewg/Fuu5z4jSBnnTmkl8sQ0aVG0=; b=qtfxB0qKLorUgba7EVPkM34Xy/gCKTjfvzKdl/LoCqebmi7CVFmJsf4OWwhK81ZqsX fVNGsEFE1sKPQNPgn1FrcPVFnHvkx4hBGqYVnqerYPo7TV3c1lS8y1hkHkIbJqBvhkZX 7k8CbG9R1O3AaxIpN9q5rtR4r85es2Rir7oVMCLH9X8W9deEOWE3WM2TJ7zavrehjC+H rrP0X09Ej50zZgScVRKI7jqAqR/WeGeICtMBZa+MsYNemYAsYX6d55W/X99r9F6ud4Qz hFaiqLo/aPZR0147oHTy3CetjpU+XwizqaX6w6w7Ua71lLGkVAm3XeBgUsK9qI4vHDbJ CS1w== X-Gm-Message-State: AOAM530X7CvYDuRm/2tRwbbyH5AZ/vtx6JczWszkDXm9Ey7Lg7jDphtt +MEAKxHUVVmYNqH74aM4vJd3vO2BGFI= X-Google-Smtp-Source: ABdhPJy5hitYGRNuHvkXiTLEjbzIARm2uRDCEG8N54Oq5CtR8CCPxyBKggsQYGymlXMtKtmAm6A2GQ== X-Received: by 2002:adf:a1cb:: with SMTP id v11mr3589392wrv.86.1603815149723; Tue, 27 Oct 2020 09:12:29 -0700 (PDT) Received: from guixSD (host-87-8-141-238.retail.telecomitalia.it. [87.8.141.238]) by smtp.gmail.com with ESMTPSA id v9sm2326970wmh.23.2020.10.27.09.12.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 09:12:28 -0700 (PDT) From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Date: Tue, 27 Oct 2020 17:12:26 +0100 Message-ID: <87lffrmyvp.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=anothersms@gmail.com; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches Hi guix! This patch adds Network UPS Tools (nut). I could test that binaries run, but could not connect to a real UPS (I need to replace my UPSs as they are currently dead). Let me know if any of you can try! Thanks, Nicolò From 0e3a16eb19bc481d38edbe36c241ec4631cbdd33 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 27 Oct 2020 10:56:35 +0100 Subject: [PATCH] gnu: Add nut. * gnu/packages/admin.scm (nut): New variable. --- gnu/packages/admin.scm | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8dcf8afd84..02dccd8021 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2020 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,6 +71,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autogen) #:use-module (gnu packages autotools) + #:use-module (gnu packages avahi) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -85,6 +87,7 @@ #:use-module (gnu packages elf) #:use-module (gnu packages file) #:use-module (gnu packages flex) + #:use-module (gnu packages freeipmi) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -110,6 +113,7 @@ #:use-module (gnu packages mcrypt) #:use-module (gnu packages mpi) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages openldap) #:use-module (gnu packages patchutils) #:use-module (gnu packages pciutils) @@ -880,6 +884,66 @@ IPv6, proxies, and Unix sockets.") (license (list license:bsd-3 license:bsd-2)))) ; atomicio.*, socks.c +(define-public nut + (package + (name "nut") + (version "2.7.4") + (source + (origin + (method url-fetch) + (uri "https://networkupstools.org/source/2.7/nut-2.7.4.tar.gz") + (sha256 + (base32 + "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq")) + (patches + (list + ;; OpenSSL 1.1 support + (origin + (method url-fetch) + (uri (string-append "https://patch-diff.githubusercontent.com/raw/" + "networkupstools/nut/pull/504.patch")) + (sha256 + (base32 "1dabbzlmb886qy39xjx6nxlfrzfkm99n48la1ip32zm3baal6qph")) + (file-name (string-append name "-openssl1.1"))))))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-all" + "--with-openssl" + ;; powerman is required (where is it hosted?) + "--without-powerman" + ;; cgi requires libgd + "--without-cgi") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-configure + ;; required to apply the patch to the ./configure script + (lambda _ + (invoke "autoconf")))))) + (native-inputs `(("autoconf" ,autoconf) + ("cppunit" ,cppunit) + ("pkg-config" ,pkg-config))) + (inputs `(("avahi" ,avahi) + ("libusb" ,libusb-compat) + ("libltdl" ,libltdl) + ("freeipmi" ,freeipmi) + ("neon" ,neon) + ("openssl" ,openssl) + ("net-snmp" ,net-snmp))) + (home-page "https://networkupstools.org") + (license + (list + ;; - most files under gpl2+ + license:gpl2+ + ;; - scripts/python/ under gpl3+ + license:gpl3+ + ;; - scripts/perl/Nut.pm same as perl (either gpl1+ or artistic) + license:gpl1+ license:artistic2.0)) + (synopsis "Collection of programs for monitoring and administering UPS") + (description "Network UPS Tools is a collection of programs which provide +a common interface for monitoring and administering UPS, PDU and SCD hardware. +It uses a layered approach to connect all of the parts. Drivers are provided +for a wide assortment of equipment."))) + (define-public sipcalc (package (name "sipcalc") -- 2.28.0