[bug#58623] [PATCH v2 0/6] import/cran: Parameterize for guix-cran.

[Lars-Dominik Braun <lars@6xq.net>]

[-- Attachment #1: Type: text/plain, Size: 107 bytes --]

Hi,

looks like I missed an inconsistency, which is fixed by the attched, additional patch.

Cheers,
Lars


[-- Attachment #2: 0007-import-cran-Depend-on-gfortran-if-.f-files-are-detec.patch --]
[-- Type: text/plain, Size: 923 bytes --]

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(-)

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)))
 
-- 
2.37.4