From 28727bc88843b9cf31f1b2eaba5be039ae47856e Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 22 Oct 2022 10:37:50 +0200
Subject: [PATCH v2 5/6] import/cran: Translate more package dependencies.

Assumes we use package variable names, not package specification names.

* guix/import/cran.scm (invalid-packages): Add more invalid names.
(transform-sysname): Transform more package names.
---
 guix/import/cran.scm | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index a89deb8e55..b10d9f391b 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -394,10 +394,13 @@ (define invalid-packages
         "c++11"
         "c++14"
         "c++17"
+        "c99"
         "getopt::long"
         "posix.1-2001"
+        "gnu"
         "linux"
         "none"
+        "posix.1-2001"
         "windows"
         "xcode"
         "xquartz"))
@@ -405,12 +408,30 @@ (define invalid-packages
 (define (transform-sysname sysname)
   "Return a Guix package name for the common package name SYSNAME."
   (match sysname
+    ("booktabs" "texlive-booktabs")
+    ("bowtie2" "bowtie")
+    ("cat" "coreutils")
     ("java" "openjdk")
+    ("exiftool" "perl-image-exiftool")
     ("fftw3" "fftw")
-    ("tcl/tk" "tcl")
-    ("booktabs" "texlive-booktabs")
     ("freetype2" "freetype")
+    ("gettext" "gnu-gettext")
+    ("gmake" "gnu-make")
+    ("libarchive-devel" "libarchive")
+    ("libarchive_dev" "libarchive")
+    ("libbz2" "bzip2")
+    ("libexpat" "expat")
+    ("liblz4" "lz4")
+    ("liblzma" "xz")
+    ("libzstd" "zstd")
+    ("libxml2-devel" "libxml2")
+    ("libz" "zlib")
+    ("pandoc-citeproc" "pandoc")
+    ("python3" "python-3")
     ("sqlite3" "sqlite")
+    ("svn" "subversion")
+    ("tcl/tk" "tcl")
+    ("whoami" "coreutils")
     (_ sysname)))
 
 (define cran-guix-name (cut guix-name "r-" <>))
-- 
2.37.4