Commit Message
Maxime Devos <maximedevos@telenet.be> 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
@@ -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")