From patchwork Sat Oct 29 04:16:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 44180 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 EF82D27BBEB; Sat, 29 Oct 2022 06:38:07 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 6ADB027BBE9 for ; Sat, 29 Oct 2022 06:38:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooeU8-0002e3-7O; Sat, 29 Oct 2022 01:34:20 -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 1oodIV-0008Dg-7M for guix-patches@gnu.org; Sat, 29 Oct 2022 00:18:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oodIJ-0006rE-Mv for guix-patches@gnu.org; Sat, 29 Oct 2022 00:18:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oodIJ-0005FV-DI for guix-patches@gnu.org; Sat, 29 Oct 2022 00:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58855] [PATCH 3/5] gnu: mcron: Use gexps and strip trailing #t. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Oct 2022 04:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58855@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 58855-submit@debbugs.gnu.org id=B58855.166701703520089 (code B ref 58855); Sat, 29 Oct 2022 04:18:03 +0000 Received: (at 58855) by debbugs.gnu.org; 29 Oct 2022 04:17:15 +0000 Received: from localhost ([127.0.0.1]:34742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oodHU-0005Dq-Sr for submit@debbugs.gnu.org; Sat, 29 Oct 2022 00:17:15 -0400 Received: from mail-qk1-f175.google.com ([209.85.222.175]:38821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oodHQ-0005Cz-4Z for 58855@debbugs.gnu.org; Sat, 29 Oct 2022 00:17:09 -0400 Received: by mail-qk1-f175.google.com with SMTP id d13so4731521qko.5 for <58855@debbugs.gnu.org>; Fri, 28 Oct 2022 21:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0Uo1FgLYBWm6yjJPX2YItGA9ufSQU+Vyct+l0/k15lY=; b=noqg/7N2fvQ4vmhhSAQTY1wkR3jCGLm9sELWOiA/OhIZEJLnj5OQMaWltMvlpkQdmb +N+4JqJbhMABzRin25ip1Boj5OKxqtgsxB0nBZyDXE5zxJ902GjvCPNx8E/3sesET1OG 4LANkAJ472OerdSf2DbwkDOhip78JiehuqzHrq+hv/Dy18jEWE8Uc6ykmcByp/8dQJN/ vQxaicEQuh0Jd1wScw/nhSIUN2H+b1XoiVJ6BaJ1isnf6Sk0qhrDagfHNjc34R+fF2o3 6kYVgbkr9nrlTZUlWDUxaWmwhzCWIlcdvKmES/92ccoqsRCPR+qSiqfY3oLdBchuistW VtXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0Uo1FgLYBWm6yjJPX2YItGA9ufSQU+Vyct+l0/k15lY=; b=16c1Dj7o6Vj1O6FY4FA+V6xCfS7U9qP9s4KPXts24GlROhwDxmrgt/iiCJE1dUETkF I6c5zAoxRmP3O4pkMqxcS+A2f9f0ISgQUgbP1txu3usCiumUVoxuU2Af+H28T4reAYQi ZwPt3tW1wbC7wnP9kCEav4AibQYH8qAScNsoXxv+QiwW355xek/rzIrlnRWYdJH084gk god7BscSmMdBodAzVKuZnrTzA+Zwlg14+JfW9WtMyW8UB1zaYn6JlJtDfGemxCQvps58 B+292SLWRCh0jXnqUNGARC3M+JKO5dsFqvF6n8QRfP2rciw2F8ujCl1qG3AKKhRBDA6t ntsA== X-Gm-Message-State: ACrzQf1vMm6E0uMhZO4i5XPowG17BPiB70mJ08xIhIAvGbdSJ6dvY3Yt X3cB4ebXsW7oXADchgN7lYWPxDvRCzg= X-Google-Smtp-Source: AMsMyM6tiky4/B26a1MvtvQqNV2z7D5PtTCfuAkQk0ridkH/vMyLD2FqyW/Ok6avM/PlOiIspb3+iA== X-Received: by 2002:a05:620a:cf0:b0:6f9:7ee1:2cc3 with SMTP id c16-20020a05620a0cf000b006f97ee12cc3mr1865821qkj.362.1667017022578; Fri, 28 Oct 2022 21:17:02 -0700 (PDT) Received: from localhost.localdomain (dsl-152-179.b2b2c.ca. [66.158.152.179]) by smtp.gmail.com with ESMTPSA id do28-20020a05620a2b1c00b006f87d28ea3asm391514qkb.54.2022.10.28.21.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 21:17:02 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 29 Oct 2022 00:16:47 -0400 Message-Id: <20221029041649.12144-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221029041649.12144-1-maxim.cournoyer@gmail.com> References: <20221029041649.12144-1-maxim.cournoyer@gmail.com> 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (mcron) [phases]: Use gexps and strip trailing #t. --- gnu/packages/guile-xyz.scm | 41 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 209ba694d7..1b41eb24af 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2667,27 +2667,26 @@ (define-public mcron "0bkn235g2ia4f7ispr9d55c7bc18282r3qd8ldhh5q2kiin75zi0")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'check 'adjust-tests - (lambda _ - (substitute* "tests/job-specifier.scm" - ;; (getpw) fails with "entry not found" in the build - ;; environment, so pass an argument. - (("\\(getpw\\)") - "(getpwnam (getuid))") - ;; The build environment lacks an entry for root in - ;; /etc/passwd. - (("\\(getpw 0\\)") - "(getpwnam \"nobody\")") - - ;; FIXME: Skip the 4 faulty tests (see above). - (("\\(test-equal \"next-year\"" all) - (string-append "(test-skip 4)\n" all))) - #t))))) - (native-inputs `(("pkg-config" ,pkg-config) - ("tzdata" ,tzdata-for-tests) - ("guile-native" ;for 'guild compile' - ,@(assoc-ref (package-inputs this-package) "guile")))) + (list + #:phases #~(modify-phases %standard-phases + (add-before 'check 'adjust-tests + (lambda _ + (substitute* "tests/job-specifier.scm" + ;; (getpw) fails with "entry not found" in the build + ;; environment, so pass an argument. + (("\\(getpw\\)") + "(getpwnam (getuid))") + ;; The build environment lacks an entry for root in + ;; /etc/passwd. + (("\\(getpw 0\\)") + "(getpwnam \"nobody\")") + ;; FIXME: Skip the 4 faulty tests (see above). + (("\\(test-equal \"next-year\"" all) + (string-append "(test-skip 4)\n" all)))))))) + (native-inputs (list guile-3.0 ;for 'guild compile' + pkg-config + tzdata-for-tests)) + (inputs (list guile-3.0)) (home-page "https://www.gnu.org/software/mcron/") (synopsis "Run jobs at scheduled times")