From patchwork Fri Apr 29 05:17:38 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: 2069 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 A9D6027BBEA; Fri, 29 Apr 2022 06:19:55 +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 EC4F227BBE9 for ; Fri, 29 Apr 2022 06:19:54 +0100 (BST) Received: from localhost ([::1]:35780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkJ2n-00081D-Md for patchwork@mira.cbaines.net; Fri, 29 Apr 2022 01:19:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkJ1y-0007y6-O2 for guix-patches@gnu.org; Fri, 29 Apr 2022 01:19:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nkJ1y-0000jl-FW for guix-patches@gnu.org; Fri, 29 Apr 2022 01:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nkJ1y-0007CE-Aq for guix-patches@gnu.org; Fri, 29 Apr 2022 01:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55179] [WIP PATCH 06/30] gnu: nqp: Update to 2022.04. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Apr 2022 05:19: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.165120948927472 (code B ref 55179); Fri, 29 Apr 2022 05:19:02 +0000 Received: (at 55179) by debbugs.gnu.org; 29 Apr 2022 05:18:09 +0000 Received: from localhost ([127.0.0.1]:50590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkJ12-00078G-0b for submit@debbugs.gnu.org; Fri, 29 Apr 2022 01:18:09 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:46066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkJ0t-000771-5I for 55179@debbugs.gnu.org; Fri, 29 Apr 2022 01:18:01 -0400 Date: Fri, 29 Apr 2022 05:17:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651209464; bh=2CVw2KRPnuIGjNS/F//PlmELIkyxbJHhHD3uh02+eTg=; 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=j0fcL3hcESN0sGQELItaxg2jpp4APzMES332JpwIjMNK1W41936fjLke4+Nqqcrgx Cq3F6odTJRGxU/Lrnuj6dJ5sSYvuhdONzjhB/CwgWN7ITZ8xQgqZeTIu0yrVULkhw0 lLCD4UGtNBaOQ8edXdymV3xuI0c9KIfD2LeOmAvwlqAbUL9QAAf7HEpTS4jVAmcEWc ftr5WIZsoRWIU6cyUBZMlxYEown3v7YTLoI3w1Ozbbl7gMW5ND6w7SI7AMZv+fOZZB r+LwyirUjYuGto1dA+mkvcVo7J2+ZrkU4anSYl6SAkeHX9Vh00Ka1PDJx2ur61U96Q mSvZ6nruoNUuA== From: "Paul A. Patience" Message-ID: <20220429051700.373076-6-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): Update to 2022.04. [arguments]: Add 'remove-calls-to-git' and 'fix-paths' phases. Remove obsolete files from 'patch-more-shebangs' phase and sort the rest. Remove 'patch-source-date' and 'remove-failing-test' phases. [native-inputs]: Add nqp-configure. [home-page]: Update. [description]: Replace mentions of Perl with Raku. --- gnu/packages/perl6.scm | 56 ++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 26 deletions(-) -- 2.36.0 diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index b510a584f2..0e0c352892 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -155,15 +155,14 @@ (define-public nqp-configure (define-public nqp (package (name "nqp") - (version "2019.03") + (version "2022.04") (source (origin (method url-fetch) - (uri (string-append "https://rakudo.perl6.org/downloads/nqp/nqp-" - version ".tar.gz")) + (uri (string-append "https://github.com/Raku/nqp/releases/download/" + version "/nqp-" version ".tar.gz")) (sha256 - (base32 - "183zhll13fx416s3hkg4bkvib77kyr857h0nydgrl643fpacxp83")) + (base32 "1777shxr8qw6m2492ckb0r301qdx5gls6kphz554dh6k4n74avam")) (modules '((guix build utils))) (snippet '(delete-file-recursively "3rdparty")))) @@ -171,25 +170,28 @@ (define-public nqp (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-calls-to-git + (lambda _ + (invoke "perl" "-ni" "-e" + "print if not /^BEGIN {/ .. /^}/" + "Configure.pl"))) + (add-after 'remove-calls-to-git 'fix-paths + (lambda _ + (substitute* "tools/build/gen-version.pl" + (("catfile\\(\\$libdir, 'MAST', \\$_\\)") + (string-append "catfile('" + (assoc-ref %build-inputs "moarvm") + "/share/nqp/lib" + "', 'MAST', $_)"))))) (add-after 'patch-source-shebangs 'patch-more-shebangs (lambda _ - (substitute* '("tools/build/install-jvm-runner.pl.in" + (substitute* '("t/nqp/111-spawnprocasync.t" + "t/nqp/113-run-command.t" "tools/build/gen-js-cross-runner.pl" "tools/build/gen-js-runner.pl" "tools/build/install-js-runner.pl" - "tools/build/install-moar-runner.pl" - "tools/build/gen-moar-runner.pl" - "t/nqp/111-spawnprocasync.t" - "t/nqp/113-run-command.t") + "tools/build/install-jvm-runner.pl.in") (("/bin/sh") (which "sh"))))) - (add-after 'unpack 'patch-source-date - (lambda _ - (substitute* "tools/build/gen-version.pl" - (("gmtime") "gmtime(0)")))) - (add-after 'unpack 'remove-failing-test - ;; One subtest fails for unknown reasons - (lambda _ - (delete-file "t/nqp/019-file-ops.t"))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -198,18 +200,20 @@ (define-public nqp "--backends=moar" "--with-moar" (string-append moar "/bin/moar") "--prefix" out))))))) + (native-inputs + (list nqp-configure)) (inputs (list moarvm)) - (home-page "https://github.com/perl6/nqp") + (home-page "https://github.com/Raku/nqp") (synopsis "Not Quite Perl") - (description "This is \"Not Quite Perl\" -- a lightweight Perl 6-like -environment for virtual machines. The key feature of NQP is that it's designed -to be a very small environment (as compared with, say, perl6 or Rakudo) and is -focused on being a high-level way to create compilers and libraries for virtual -machines like MoarVM, the JVM, and others. + (description "This is \"Not Quite Perl\" -- a lightweight Raku-like +environment for virtual machines. The key feature of NQP is that it's +designed to be a very small environment (as compared with, say, Rakudo) and is +focused on being a high-level way to create compilers and libraries for +virtual machines like MoarVM, the JVM, and others. -Unlike a full-fledged implementation of Perl 6, NQP strives to have as small a -runtime footprint as it can, while still providing a Perl 6 object model and +Unlike a full-fledged implementation of Raku, NQP strives to have as small a +runtime footprint as it can, while still providing a Raku object model and regular expression engine for the virtual machine.") (license license:artistic2.0)))