From patchwork Fri Apr 29 05:17:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 2062 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 BEF5D27BBEA; Fri, 29 Apr 2022 06:18:15 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 822B327BBE9 for ; Fri, 29 Apr 2022 06:18:15 +0100 (BST) Received: from localhost ([::1]:34454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkJ1C-00075B-M3 for patchwork@mira.cbaines.net; Fri, 29 Apr 2022 01:18:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkJ11-00070c-Gv for guix-patches@gnu.org; Fri, 29 Apr 2022 01:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nkJ11-0000ay-5w for guix-patches@gnu.org; Fri, 29 Apr 2022 01:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nkJ10-00077u-VA for guix-patches@gnu.org; Fri, 29 Apr 2022 01:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55179] [WIP PATCH 02/30] gnu: nqp: Remove trailing booleans. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Apr 2022 05:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55179 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55179@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 55179-submit@debbugs.gnu.org id=B55179.165120944627282 (code B ref 55179); Fri, 29 Apr 2022 05:18:02 +0000 Received: (at 55179) by debbugs.gnu.org; 29 Apr 2022 05:17:26 +0000 Received: from localhost ([127.0.0.1]:50565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkJ0P-00075y-UN for submit@debbugs.gnu.org; Fri, 29 Apr 2022 01:17:26 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:32249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkJ0N-00075l-N5 for 55179@debbugs.gnu.org; Fri, 29 Apr 2022 01:17:24 -0400 Date: Fri, 29 Apr 2022 05:17:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651209437; bh=mQ8cMSyayKHF8vQ48ikXj8bM/ufxZn0Koww+ajjP1kI=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=OGtgvLQmGjKaHae1OctICKUdHtUkNRzu7pfycEL0yX0KjNPJsA6m0UrVSc6PZQpfX 86bvp1nb4/oHcBnmLOVeYI0ubkKQmKlvE0uxMKBSXw9MsM3GChmqeHQOhZYoDUHepf xhW6ChrVwwJo0tgXS+9+ew1BegZe3P/GZajZS6PKObUbwzl/OJmoFctx5UdVJsl8LA WRL01foZvXfvbn+vU9Zj7eu4F/pJziNPcKzh5CkLHBZ+I5ZWqs5hP5dHmYCPFeZQ3E 3HfbP/FM22wow4COy46stO6i4/qFM2U0O1A2USyva+h2y74/yn2mds6L3P/xhzXG8K r746J0slSpZsw== From: "Paul A. Patience" Message-ID: <20220429051700.373076-2-paul@apatience.com> In-Reply-To: <20220429051700.373076-1-paul@apatience.com> References: <20220429051700.373076-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/perl6.scm (nqp)[source]: Reindent. [snippet]: Remove trailing boolean (and therefore the 'begin'). [arguments]: Remove trailing booleans. Reindent. --- gnu/packages/perl6.scm | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) -- 2.36.0 diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 3c3646587a..5f807a1743 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -100,17 +100,16 @@ (define-public nqp (name "nqp") (version "2019.03") (source - (origin - (method url-fetch) - (uri (string-append "https://rakudo.perl6.org/downloads/nqp/nqp-" - version ".tar.gz")) - (sha256 - (base32 - "183zhll13fx416s3hkg4bkvib77kyr857h0nydgrl643fpacxp83")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "3rdparty") #t)))) + (origin + (method url-fetch) + (uri (string-append "https://rakudo.perl6.org/downloads/nqp/nqp-" + version ".tar.gz")) + (sha256 + (base32 + "183zhll13fx416s3hkg4bkvib77kyr857h0nydgrl643fpacxp83")) + (modules '((guix build utils))) + (snippet + '(delete-file-recursively "3rdparty")))) (build-system perl-build-system) (arguments '(#:phases @@ -125,21 +124,18 @@ (define-public nqp "tools/build/gen-moar-runner.pl" "t/nqp/111-spawnprocasync.t" "t/nqp/113-run-command.t") - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (add-after 'unpack 'patch-source-date (lambda _ (substitute* "tools/build/gen-version.pl" - (("gmtime") "gmtime(0)")) - #t)) + (("gmtime") "gmtime(0)")))) (add-after 'unpack 'remove-failing-test ;; One subtest fails for unknown reasons (lambda _ - (delete-file "t/nqp/019-file-ops.t") - #t)) + (delete-file "t/nqp/019-file-ops.t"))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) + (let ((out (assoc-ref outputs "out")) (moar (assoc-ref inputs "moarvm"))) (invoke "perl" "Configure.pl" "--backends=moar"