From patchwork Mon May 29 14:45:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50432 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 5D95727BBEA; Mon, 29 May 2023 15:47:50 +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.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 4730627BBE2 for ; Mon, 29 May 2023 15:47:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3e9d-0002LN-Mk; Mon, 29 May 2023 10:47:25 -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 1q3e9N-00027x-Qe for guix-patches@gnu.org; Mon, 29 May 2023 10:47:09 -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 1q3e9N-00035M-Iu for guix-patches@gnu.org; Mon, 29 May 2023 10:47:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3e9N-0001Qu-EN; Mon, 29 May 2023 10:47:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63571] [PATCH v2 19/19] gnu: Add updater input properties for R and Python packages. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Mon, 29 May 2023 14:47:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63571@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Ricardo Wurmus X-Debbugs-Original-Xcc: Ricardo Wurmus Received: via spool by 63571-submit@debbugs.gnu.org id=B63571.16853716185350 (code B ref 63571); Mon, 29 May 2023 14:47:09 +0000 Received: (at 63571) by debbugs.gnu.org; 29 May 2023 14:46:58 +0000 Received: from localhost ([127.0.0.1]:58799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3e9B-0001O8-Vp for submit@debbugs.gnu.org; Mon, 29 May 2023 10:46:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3e8K-0001Jw-Lg for 63571@debbugs.gnu.org; Mon, 29 May 2023 10:46:10 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3e8F-0002h2-EH; Mon, 29 May 2023 10:45:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=9Xshf3HkiiRkzXMmHMtOendBTTzsnIcuPVsyPpOMg+Y=; b=rn/6YJv5TUGgZYxlJwEr KAZ8FsKvX9ZAotie+kCCAkSdGdT/PiilOEW1/Qyfd2jqTkKw2KrljF8/obft1bJavv3DWJxGThKl9 QiYh0BDmAcCnqAWS2FXUazi9CtE6mb+yrj+LnsvIOIqqfHMcG8eXJP+zhDXhfQrSGk6mqN4liVXYs LxVw4vtCVH0FiG+mVXQTiY465udMTcPOVbdbOC+pXfobirsj/4M3j52qED2FQMdN0ZBeayzzGjOti x303ydt5pAcCzK8lllyPMIsygJDkXpv138xYkMylvKDfFgcdv7opvX10KAEphRqlYVqV5DzO1tyTx yjgtym+l2u/WUQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3e8F-00044B-0r; Mon, 29 May 2023 10:45:59 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 29 May 2023 16:45:30 +0200 Message-Id: <36380ecc2bc3946fb14b91d3e300f875a61d250b.1685371175.git.ludo@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <87y1l7fb9j.fsf@gnu.org> References: <87y1l7fb9j.fsf@gnu.org> 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/cran.scm (r-glue, r-xfun, r-vctrs) (r-lifecycle): Turn comment about r-knitr into 'properties' field. * gnu/packages/mpi.scm (python-mpi4py)[properties]: New field. --- gnu/packages/cran.scm | 36 ++++++++++++++++-------------------- gnu/packages/mpi.scm | 2 ++ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4fafcaea9c..fa6f86c587 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5085,11 +5085,10 @@ (define-public r-glue (base32 "1gzxk5jgdh2xq9r7z09xs306ygzf27vhg3pyfl7ck1755gqii9cx")))) (build-system r-build-system) - ;; knitr depends on glue, so we can't add knitr here to build the - ;; vignettes. - #; - (native-inputs - `(("r-knitr" ,r-knitr))) + (properties + ;; knitr depends on glue, so we can't add knitr here to build the + ;; vignettes. + '((updater-ignored-native-inputs . ("r-knitr")))) (home-page "https://github.com/tidyverse/glue") (synopsis "Interpreted string literals") (description @@ -8777,10 +8776,9 @@ (define-public r-xfun (sha256 (base32 "1jan2ggfywm1g05zszyy8d492wj7vpy35682lrnlklrx4jxsmv6h")))) (build-system r-build-system) - ;; knitr itself depends on xfun - #; - (native-inputs - `(("r-knitr" ,r-knitr))) + (properties + ;; knitr itself depends on xfun + '((updater-ignored-native-inputs . ("r-knitr")))) (home-page "https://github.com/yihui/xfun") (synopsis "Miscellaneous functions") (description @@ -8867,11 +8865,10 @@ (define-public r-vctrs (build-system r-build-system) (propagated-inputs (list r-cli r-glue r-lifecycle r-rlang)) - ;; We can't have r-knitr among the inputs here, because r-vctrs ends up - ;; being an eventual input to r-knitr. - #; - (native-inputs - (list r-knitr)) + (properties + ;; We can't have r-knitr among the inputs here, because r-vctrs ends up + ;; being an eventual input to r-knitr. + '((updater-ignored-native-inputs . ("r-knitr")))) (home-page "https://github.com/r-lib/vctrs") (synopsis "Vector helpers") (description @@ -25253,15 +25250,14 @@ (define-public r-lifecycle (sha256 (base32 "1hk9mblhap429fk77qpgc4hv0j91q5wpahi0y76w118m471zsnb4")))) - (properties `((upstream-name . "lifecycle"))) (build-system r-build-system) (propagated-inputs (list r-cli r-glue r-rlang)) - ;; We can't add this here because via r-stringr this package ends up being - ;; an input to r-knitr. - #; - (native-inputs - (list r-knitr)) ; for vignettes + (properties + ;; We can't add this here because via r-stringr this package ends up + ;; being an input to r-knitr. + '((updater-ignored-native-inputs . ("r-knitr")) + (upstream-name . "lifecycle"))) (home-page "https://github.com/r-lib/lifecycle") (synopsis "Manage the life cycle of your package functions") (description diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index fb874484bf..c78799e640 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -422,6 +422,8 @@ (define-public python-mpi4py #t))))) (inputs (list openmpi)) + (properties + '((updater-extra-inputs . ("openmpi")))) (home-page "https://bitbucket.org/mpi4py/mpi4py/") (synopsis "Python bindings for the Message Passing Interface standard") (description "MPI for Python (mpi4py) provides bindings of the Message