From patchwork Mon Oct 9 20:06:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54692 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 96D1527BBE9; Mon, 9 Oct 2023 22:19:31 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 0F7C827BBE2 for ; Mon, 9 Oct 2023 22:19:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpxeN-0007Xq-Eo; Mon, 09 Oct 2023 17:18:51 -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 1qpxeI-0007UM-3U for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:46 -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 1qpxeF-0006xg-FD for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpxeY-0007dj-PT; Mon, 09 Oct 2023 17:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 50/63] gnu: alsa-utils: Rewrite with G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 21:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal , Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169688628529128 (code B ref 65479); Mon, 09 Oct 2023 21:19:02 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 21:18:05 +0000 Received: from localhost ([127.0.0.1]:33511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxdc-0007Zc-W1 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:05 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:60206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxda-0007Yq-Ee for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:03 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 1CBBF207FC for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 23:17:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 9107780095; Mon, 9 Oct 2023 23:17:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8QZ9_ixrVGSS; Mon, 9 Oct 2023 23:17:37 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 1F4C58009B; Mon, 9 Oct 2023 23:17:37 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:38 +0100 Message-ID: <3314a06c07e2379ca13a437d2ddea9dc0a140f42.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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/linux.scm (alsa-utils)[arguments]: Rewrite with G-Expressions. <#:phases>: Drop obsolete 'disable-broken-test phase. Drop trailing #t. --- gnu/packages/linux.scm | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index de9fe978d9..7f9cafaf1b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2958,28 +2958,19 @@ (define-public alsa-utils "09m4dnn4kplawprd2bl15nwa0b4r1brab3x44ga7f1fyk7aw5zwq")))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list ;; The udev rule is responsible for restoring - ;; the volume. - (string-append "--with-udev-rules-dir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d")) - #:phases - (modify-phases %standard-phases - (add-before 'check 'disable-broken-test - (lambda _ - ;; XXX: The 1.1.8 release tarball is missing a header that's - ;; required for this test to work. Fixed in 1.1.9. - (substitute* "axfer/test/Makefile" - ((".*container-test.*") "")) - #t)) - (add-before - 'install 'pre-install - (lambda _ - ;; Don't try to mkdir /var/lib/alsa. - (substitute* "Makefile" - (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*") - "true\n")) - #t))))) + (list + #:configure-flags + #~(list + ;; The udev rule is responsible for restoring the volume. + (string-append "--with-udev-rules-dir=" #$output "/lib/udev/rules.d")) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'pre-install + (lambda _ + ;; Don't try to mkdir /var/lib/alsa. + (substitute* "Makefile" + (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*") + "true\n"))))))) (native-inputs (list docbook-xml-4.2 docbook-xsl xmlto gettext-minimal))