From patchwork Sat May 28 11:21:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wil deBeest X-Patchwork-Id: 39646 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 29EDF27BBEA; Sat, 28 May 2022 13:54:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 895AF27BBE9 for ; Sat, 28 May 2022 13:54:54 +0100 (BST) Received: from localhost ([::1]:48436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nuvy1-0005M9-L7 for patchwork@mira.cbaines.net; Sat, 28 May 2022 08:54:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nuuX8-0003O7-JH for guix-patches@gnu.org; Sat, 28 May 2022 07:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nuuX8-00063O-9f for guix-patches@gnu.org; Sat, 28 May 2022 07:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nuuX8-0005El-58 for guix-patches@gnu.org; Sat, 28 May 2022 07:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54974] [PATCH] added btop References: <3D9386AF-4BB9-4C79-B170-A6A2AEC13728@4tii.de> In-Reply-To: <3D9386AF-4BB9-4C79-B170-A6A2AEC13728@4tii.de> Resent-From: Wil deBeest Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 May 2022 11:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54974 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 54974@debbugs.gnu.org, Greg Hogan Received: via spool by 54974-submit@debbugs.gnu.org id=B54974.165373692720053 (code B ref 54974); Sat, 28 May 2022 11:23:02 +0000 Received: (at 54974) by debbugs.gnu.org; 28 May 2022 11:22:07 +0000 Received: from localhost ([127.0.0.1]:36550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuuWF-0005DM-3x for submit@debbugs.gnu.org; Sat, 28 May 2022 07:22:07 -0400 Received: from mail.4tii.de ([178.254.9.173]:47000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nuuW6-0005Cf-Qa for 54974@debbugs.gnu.org; Sat, 28 May 2022 07:22:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=4tii.de; s=mail; t=1653736911; bh=CZlCeZMAkYT9NfN0qao6V8fcjXTGJsG+1ORbsAWy+80=; h=From:Subject:Date:Cc:To; b=4fG/zig8IaoJajMd0oUxRmHMMHWaN/+EeV4cvOrtiz7RfmKQqt6lFyg5Kj2rloNFi 6g00lERggVGsgL7ZUb5a0RsFILhF6hX/G5lKvw67YFOe7on6RGKr4LqWJnuSrQpqbB 3wxuxW1462NKq+HzLwW52iVGZKwBnKseC0q+5R4E= From: Wil deBeest Mime-Version: 1.0 (1.0) Message-Id: Date: Sat, 28 May 2022 13:21:49 +0200 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 28 May 2022 08:54:44 -0400 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 Maxime Devos writes: > [[PGP Signed Part:Undecided]] > Wil deBeest schreef op vr 29-04-2022 om 01:17 [+0200]: >> Hi Maxime, >>> Long term, %outputs, %build-inputs, ... are being phased out, so I'd go >>> with, so I'd go with >>> (arguments (list #:make-flags #~(string-append "PREFIX=" #$output))) >>> here instead. >> I haven't been able to integrate your snippet into the package. Could you >> show me how to do so or tell me which part of the handbook would be >> relevant? > > For a good example, see the 'stress-ng' package definition 'guix edit > stress-ng'. #:make-flags is documented in the manual (search for > #:make-flags or go to (guix)Build Systems). #$output is documented in > ‘(guix)G-Expressions’. > > Very concretely: > > (package > [...] > (arguments (list #:tests? #false ; some comment > #:make-flags #~(...) > #:phases > ;; [Stuff for replacing the install phase and > ;; removing the configure phase] > #~(modify-phases %standard-phases ...)))) > > Greetings, > Maxime. > > [[End of PGP Signed Part]] Thank you, I think I got it. I've also added gcc-12 as a native input for efficiency reasons [1]. Since I'm not familiar with the process of deprecation, I've kept the thoughts I had written down regarding your question on whether bashtop & bpytop could be removed, even though there's probably nothing in there that hasn't at least been discussed before [2] Cheers! --- gnu/packages/admin.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) base-commit: 6e9d99f97f15347f44df0518faa5e3b8b9d5184e diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index af75dee697..fccc0e8dd3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -101,6 +101,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages file) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -752,6 +753,37 @@ (define-public bpytop @command{bashtop}.") (license license:asl2.0))) +(define-public btop + (package + (name "btop") + (version "1.2.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aristocratos/btop") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03nd34q1w01visd2bg7mxrcjn0s6lnbm4s0vsfsj2mfv1rvyjl5b")))) + (native-inputs (list gcc-12)) + (build-system gnu-build-system) + (arguments + (list #:make-flags + #~(list (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)) + #:tests? #f)) + (home-page "https://github.com/aristocratos/btop") + (synopsis "Resource monitor") + (description "Resource monitor that shows usage and stats +for processor, memory, disks, network and processes. + +C++ version and continuation of bashtop and bpytop.") + (license license:asl2.0))) + (define-public pies (package (name "pies")