guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

09/12: import/cran: Transform external package names to Guix names.


From: guix-commits
Subject: 09/12: import/cran: Transform external package names to Guix names.
Date: Wed, 28 Sep 2022 16:14:57 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit e761ed7384a8a086c5fed95336123a0ba6fc0cb1
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Sep 28 22:04:01 2022 +0200

    import/cran: Transform external package names to Guix names.
    
    * guix/import/cran.scm (transform-sysname): New procedure.
    (description->package): Use it on inputs that are derived from "sysdepends".
---
 guix/import/cran.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index d60e9a3b1f..ec70370863 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -367,6 +367,14 @@ empty list when the FIELD cannot be found."
         "xcode"
         "xquartz"))
 
+(define (transform-sysname sysname)
+  "Return a Guix package name for the common package name SYSNAME."
+  (match sysname
+    ("java" "openjdk")
+    ("fftw3" "fftw")
+    ("tcl/tk" "tcl")
+    (_ sysname)))
+
 (define cran-guix-name (cut guix-name "r-" <>))
 
 (define (tarball-needs-fortran? tarball)
@@ -561,7 +569,7 @@ from the alist META, which was derived from the R package's 
DESCRIPTION file."
                     `((properties ,`(,'quasiquote ((,'upstream-name . 
,name)))))
                     '())
               (build-system r-build-system)
-              ,@(maybe-inputs sysdepends)
+              ,@(maybe-inputs (map transform-sysname sysdepends))
               ,@(maybe-inputs (map cran-guix-name propagate) 
'propagated-inputs)
               ,@(maybe-inputs
                  `(,@(if (needs-fortran? source (not (or git? hg?)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]