From patchwork Sat Mar 23 07:13:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 62139 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 1085427BBEA; Sat, 23 Mar 2024 08:42:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 4457627BBE2 for ; Sat, 23 Mar 2024 08:42:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnwxK-0002ya-Ce; Sat, 23 Mar 2024 04:42:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnwxJ-0002yD-HS for guix-patches@gnu.org; Sat, 23 Mar 2024 04:42:21 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnwxJ-0005z1-9S for guix-patches@gnu.org; Sat, 23 Mar 2024 04:42:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnwxy-00064d-93 for guix-patches@gnu.org; Sat, 23 Mar 2024 04:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69957] [PATCH gnome-team 2/2] gnu: duc: Update style. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Mar 2024 08:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69957 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69957@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 69957-submit@debbugs.gnu.org id=B69957.171118333923252 (code B ref 69957); Sat, 23 Mar 2024 08:43:02 +0000 Received: (at 69957) by debbugs.gnu.org; 23 Mar 2024 08:42:19 +0000 Received: from localhost ([127.0.0.1]:37139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnwxG-00062x-O8 for submit@debbugs.gnu.org; Sat, 23 Mar 2024 04:42:19 -0400 Received: from planete-kraus.eu ([89.234.140.182]:56800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnwxB-00062B-Kk for 69957@debbugs.gnu.org; Sat, 23 Mar 2024 04:42:14 -0400 Received: from planete-kraus.eu (localhost.localdomain [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id bdafc43f; Sat, 23 Mar 2024 08:41:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=tTUqdreY4v52mbttUG191v7Lhx8=; b=J NeEl34kq7VuPPaC/8fvAQEOYvi6ydGHrAElNEXindf9MFry21EVjMR8WJRdELBJP WnQ1YFL2OvVwzAxDp3ndlqOkymnDFKgvbTsCooVlg++bSzycKNit0OpWa9WNAzqH CH0WbEggr91gyMHuK42+OHlGT/0aUKdVH+/Rgq8Hg4mpbZWVoH9xf21l/+XcIggI GNYgWVjncaKOCJKSIKwYxHavfy7apIUHZz0OE1Bcuf8DpwBtRhupEH3QBdxiWNZu Wx+kn6ojUg0zFpR4zoWDCMVlyOERflwjcFl9x9L9Io1DeLRW3fdvNVzIULgEEuxN YjXkV8YmRipdcC6BIXa/Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 1f438157 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 23 Mar 2024 08:41:23 +0000 (UTC) Message-ID: <672487dc535ab1f95f95028a95e095b4d7922508.1711178973.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 23 Mar 2024 08:13:49 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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