From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: 69957@debbugs.gnu.org
Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu,
liliana.prikler@gmail.com, maxim.cournoyer@gmail.com
Subject: [bug#69957] [PATCH gnome-team 2/2] gnu: duc: Update style.
Date: Sat, 23 Mar 2024 08:13:49 +0100 [thread overview]
Message-ID: <672487dc535ab1f95f95028a95e095b4d7922508.1711178973.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <cover.1711178973.git.vivien@planete-kraus.eu>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3673 bytes --]
* gnu/packages/disk.scm (duc) [arguments]: Convert to list of G-Expressions.
Change-Id: Iefcdcc55b1e71f7e866cb04795ef74f3b675cfce
---
gnu/packages/disk.scm | 55 ++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index ea18a98ab6..2e2c5739cc 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1567,33 +1567,34 @@ (define-public duc
(search-patches "duc-fix-test-sh.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- (substitute* "src/duc/cmd-ui.c"
- (("ncursesw/ncurses.h") "ncurses.h"))
- (substitute* "examples/index.cgi"
- (("/usr/local/bin/duc")
- (string-append out "/bin/duc"))))))
- (add-after 'install 'install-examples
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (string-append out "/share/doc/" ,name "-" ,version)))
- (copy-recursively "examples" (string-append doc "/examples")))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (substitute* "test.sh"
- ;; Keep the test logs where --keep-failed can see them.
- (("^(DUC_TEST_DIR=).*" _ assign)
- (format #f "~a~a/test-directory~%" assign (getcwd)))
- ;; XXX ‘actual size’ differed on my system (a consistent 348160
- ;; bytes where the tests expect 540672). However, the ‘apparent
- ;; size’ matches, as does the actual test output. Good enough…?
- ((" [0-9]*B actual") " [0-9]*B actual"))
- (when tests?
- (invoke "./test.sh"))))))) ; no ‘check’ target
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (substitute* "src/duc/cmd-ui.c"
+ (("ncursesw/ncurses.h") "ncurses.h"))
+ (substitute* "examples/index.cgi"
+ (("/usr/local/bin/duc")
+ (string-append out "/bin/duc"))))))
+ (add-after 'install 'install-examples
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (string-append out "/share/doc/" #$name "-" #$version)))
+ (copy-recursively "examples" (string-append doc "/examples")))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (substitute* "test.sh"
+ ;; Keep the test logs where --keep-failed can see them.
+ (("^(DUC_TEST_DIR=).*" _ assign)
+ (format #f "~a~a/test-directory~%" assign (getcwd)))
+ ;; XXX ‘actual size’ differed on my system (a consistent 348160
+ ;; bytes where the tests expect 540672). However, the ‘apparent
+ ;; size’ matches, as does the actual test output. Good enough…?
+ ((" [0-9]*B actual") " [0-9]*B actual"))
+ (when tests?
+ (invoke "./test.sh"))))))) ; no ‘check’ target
(native-inputs
(list autoconf automake libtool pkg-config))
(inputs
--
2.41.0
prev parent reply other threads:[~2024-03-23 8:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-23 7:29 [bug#69957] [PATCH gnome-team 0/2] Fix Duc build Vivien Kraus via Guix-patches via
2024-03-23 7:12 ` [bug#69957] [PATCH gnome-team 1/2] gnu: duc: Fix build Vivien Kraus via Guix-patches via
2024-03-23 10:15 ` Liliana Marie Prikler
2024-03-24 10:32 ` Christopher Baines
2024-03-23 7:13 ` Vivien Kraus via Guix-patches via [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=672487dc535ab1f95f95028a95e095b4d7922508.1711178973.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=69957@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.