| Message ID | Y4iKZciaby7GYVjx@noor.fritz.box |
|---|---|
| State | New |
| Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B07BA27BBEC; Thu, 1 Dec 2022 11:06:18 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 D37DD27BBEB for <patchwork@mira.cbaines.net>; Thu, 1 Dec 2022 11:06:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1p0hOJ-0005FY-13; Thu, 01 Dec 2022 06:06:07 -0500 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 <Debian-debbugs@debbugs.gnu.org>) id 1p0hOH-0005FQ-US for guix-patches@gnu.org; Thu, 01 Dec 2022 06:06:05 -0500 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 <Debian-debbugs@debbugs.gnu.org>) id 1p0hOH-0001A6-MO for guix-patches@gnu.org; Thu, 01 Dec 2022 06:06:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1p0hOE-0007pX-Hj for guix-patches@gnu.org; Thu, 01 Dec 2022 06:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#58623] [PATCH v2 0/6] import/cran: Parameterize for guix-cran. Resent-From: Lars-Dominik Braun <lars@6xq.net> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Dec 2022 11:06:02 +0000 Resent-Message-ID: <handler.58623.B58623.166989272630092@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= <ludo@gnu.org> Cc: rekado@elephly.net, 58623@debbugs.gnu.org Received: via spool by 58623-submit@debbugs.gnu.org id=B58623.166989272630092 (code B ref 58623); Thu, 01 Dec 2022 11:06:02 +0000 Received: (at 58623) by debbugs.gnu.org; 1 Dec 2022 11:05:26 +0000 Received: from localhost ([127.0.0.1]:39043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1p0hNd-0007pI-V2 for submit@debbugs.gnu.org; Thu, 01 Dec 2022 06:05:26 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:36680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lars@6xq.net>) id 1p0hNY-0007p9-Jg for 58623@debbugs.gnu.org; Thu, 01 Dec 2022 06:05:24 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4NNCsP0ct5z9sQw; Thu, 1 Dec 2022 12:05:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1669892713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ikg+VKmUD48kfyeXBa3+Gy48vajTq/1DLhCrwEIneTU=; b=H38k8jqOxduimIU4QBGBAvMJvHPTwhKUL6RJ9EdQbvegxX94Z20tcPfRcWvdsaRsrAmakO fMEDtulYhCKe5bZJZNcR2V83hSeABTaJQU86dRdnHqUoAVogIRKli+soeizSdHbwIWJi1E la9136oS38zjy9qtYp3mH/o+b3EmNkJbXVnhnFTgbjooI5S9YJ+eo1LNJd6k7n2k1Lu3ON kRO/I+Ogt5AhSEP35xcCV1uWtUQpyooVJhKluxJtFc/+mGP/Dk7I7ipiJVcXQTCK1fXl2S oo6AsnHFQZIe0gWKIfYOr2GAr0myIMzBXufWOYP37ukrZi3GSix2j29wDF3Ibg== Date: Thu, 1 Dec 2022 12:05:09 +0100 From: Lars-Dominik Braun <lars@6xq.net> Message-ID: <Y4iKZciaby7GYVjx@noor.fritz.box> References: <Y0/DVVjwYCtiDRxd@noor.fritz.box> <87iljti0w9.fsf@gnu.org> <Y4eJBoocw9aAgI6R@noor.fritz.box> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="vUTgcMuoUpxUUEpO" Content-Disposition: inline In-Reply-To: <Y4eJBoocw9aAgI6R@noor.fritz.box> X-Rspamd-Queue-Id: 4NNCsP0ct5z9sQw X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
diff --git a/guix/import/cran.scm b/guix/import/cran.scm index f130543c4c..c71ff957b6 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -438,7 +438,7 @@ (define cran-guix-name (cut guix-name "r-" <>)) (define (directory-needs-fortran? dir) "Check if the directory DIR contains Fortran source files." - (match (find-files dir "\\.f(90|95)$") + (match (find-files dir "\\.f(90|95)?$") (() #f) (_ #t)))
Hi, looks like I missed an inconsistency, which is fixed by the attched, additional patch. Cheers, Lars From f980c02442ab1cc01787a6cc8462f747ccc5ff11 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun <lars@6xq.net> Date: Thu, 1 Dec 2022 12:00:53 +0100 Subject: [PATCH v2 7/7] import/cran: Depend on gfortran if .f files are detected too. There was an inconsistency between tarball-needs-fortran? and directory-needs-fortran?. * guix/import/cran.scm (directory-needs-fortran?): Match .f files too. --- guix/import/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)