From patchwork Fri Nov 5 06:05:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34257 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 D829F27BBE3; Fri, 5 Nov 2021 06:07:18 +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_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, 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 9C4E627BBE1 for ; Fri, 5 Nov 2021 06:07:18 +0000 (GMT) Received: from localhost ([::1]:53624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1misNh-0007UG-Me for patchwork@mira.cbaines.net; Fri, 05 Nov 2021 02:07:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1misNT-0007TF-5R for guix-patches@gnu.org; Fri, 05 Nov 2021 02:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1misNS-00085V-Sy for guix-patches@gnu.org; Fri, 05 Nov 2021 02:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1misNS-0002oc-Ho for guix-patches@gnu.org; Fri, 05 Nov 2021 02:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47798] [PATCH v2] gnu: Add collectl. References: <4270400a-fcf1-aec6-3dd6-9dbccca03cc5@gnu.org> In-Reply-To: <4270400a-fcf1-aec6-3dd6-9dbccca03cc5@gnu.org> Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Nov 2021 06:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "47798@debbugs.gnu.org" <47798@debbugs.gnu.org> Received: via spool by 47798-submit@debbugs.gnu.org id=B47798.163609237110754 (code B ref 47798); Fri, 05 Nov 2021 06:07:02 +0000 Received: (at 47798) by debbugs.gnu.org; 5 Nov 2021 06:06:11 +0000 Received: from localhost ([127.0.0.1]:44436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1misMc-0002nO-J1 for submit@debbugs.gnu.org; Fri, 05 Nov 2021 02:06:11 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:51016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1misMW-0002mq-4v for 47798@debbugs.gnu.org; Fri, 05 Nov 2021 02:06:08 -0400 Date: Fri, 05 Nov 2021 06:05:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636092353; bh=0a9QIvhZgvamqDpPXvKx9BredQOD4dbqAzTteWksWx8=; h=Date:To:From:Reply-To:Subject:From; b=M41lQZZuplH1FC+OQ7OUIj/LPCryg+vxzzMY/6X9P1rFtEJ9gyx1GKyqygz1gUAD+ 03aqkzP/rC49zWvkfUOuVtqJwtF1dgOja0DF4au9DNkBT4mE+je375h/EQ1x9Yv41T bB1jYZ5A3hqU98m3Yl+pDV9ldKH+4tqijS9UjegY= Message-ID: 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi zimoun and Roel, I've build and used the package. The only issue was with the copyright line, therefore I'm sending this patch. Petr ----8>------------cut here------------------->8----------- * gnu/packages/admin.scm (collectl): New variable. --- 2.33.1 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 86b6b7ce50..33aebfecfe 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -430,6 +431,47 @@ (define-public cloud-utils @end itemize") (license license:gpl3))) +(define-public collectl + (package + (name "collectl") + (version "4.3.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/collectl/collectl/collectl-" version + "/collectl-" version ".src.tar.gz")) + (sha256 + (base32 + "1wc9k3rmhqzh6cx5dcpqhlc3xcpadsn2ic54r19scdjbjx6jd1r1")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; There are no tests. + #:phases + (modify-phases %standard-phases + (delete 'build) ; There's nothing to build. + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "INSTALL" + (("DESTDIR:=\"/\"") (format #f "DESTDIR:=~s" + (assoc-ref outputs "out"))) + (("DESTDIR/usr") "DESTDIR")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "collectl" + (("\\$configFile='';") + (string-append "$configFile='" + (assoc-ref outputs "out") + "/etc';"))) + (invoke "./INSTALL")))))) + (inputs + `(("perl" ,perl))) + (home-page "http://collectl.sourceforge.net") + (synopsis "Performance data collector") + (description "This package provides a program that collects various +performance measurement data like CPU, memory, disk and network performance +numbers.") + (license license:artistic2.0))) + (define-public daemontools (package (name "daemontools")