hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit 3243e3f23119643fd662bbae7a6ec83ee753375f
Author: Efraim Flashner <[email protected]>
AuthorDate: Wed Nov 13 10:52:32 2024 +0200
gnu: ncdu: Update to 2.6.
* gnu/packages/ncdu.scm (ncdu): Update to 2.6.
[source]: Adjust snippet to not remove manpage. Adjust sources to
correctly find libzstd.
[arguments]: Remove adjustments to phases.
[native-inputs]: Add zstd:lib.
Change-Id: I6e85f06f22dcd5d62b41009039b984e6b8e65b28
---
gnu/packages/ncdu.scm | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm
index f68b682fbb..2cf79f8119 100644
--- a/gnu/packages/ncdu.scm
+++ b/gnu/packages/ncdu.scm
@@ -20,8 +20,9 @@
(define-module (gnu packages ncdu)
#:use-module (gnu packages)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages ncurses)
- #:use-module (gnu packages perl)
+ #:use-module (gnu packages zig)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
@@ -60,29 +61,23 @@ ncurses installed.")
(package
(inherit ncdu-1)
(name "ncdu")
- (version "2.2.2")
+ (version "2.6")
(source (origin
(method url-fetch)
(uri (string-append "https://dev.yorhel.nl/download/ncdu-";
version ".tar.gz"))
(sha256
(base32
- "14zrmcxnrczamqjrib99jga05ixk0dzfav3pd6s1h8vm9q121nch"))
- (modules '((guix build utils)))
+ "01g5mpvsm78lkd0yin82gyancrl23npy69qcp3d60vmm72yiwirz"))
(snippet
- #~(begin
- ;; Delete a pregenerated man page. We'll build it
ourselves.
- (delete-file "ncdu.1")))))
+ #~(begin (use-modules (guix build utils))
+ ;; Otherwise we search for liblibzstd.
+ (substitute* "build.zig"
+ (("libzstd") "zstd"))))))
(build-system zig-build-system)
(arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (delete 'validate-runpath)
- (add-after 'build 'build-manpage
- (lambda _
- (invoke "make" "doc"))))))
- (native-inputs (list perl))
+ (list #:zig zig-0.12))
+ (inputs (list ncurses `(,zstd "lib")))
(properties `((tunable? . #t)))))
(define-public ncdu-2
