From 952953be39527ec315e95e039f27d9bdc020d37e 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] 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 | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index b59b7b287f..0c45a676cf 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -395,7 +395,9 @@ (define invalid-packages
         "c++11"
         "c++14"
         "c++17"
+        "c99"
         "getopt::long"
+        "gnu"
         "posix.1-2001"
         "linux"
         "none"
@@ -406,15 +408,33 @@ (define invalid-packages
 (define (transform-sysname sysname)
   "Return a Guix package name for the common package name SYSNAME."
   (match sysname
-    ("java" "openjdk")
-    ("fftw3" "fftw")
-    ("tcl/tk" "tcl")
     ("booktabs" "texlive-booktabs")
+    ("bowtie2" "bowtie")
+    ("cat" "coreutils")
+    ("java" "openjdk")
+    ("exiftool" "perl-image-exiftool")
+    ("fftw3" "fftw")
     ("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")
     ("mariadb-devel" "mariadb")
     ("mysql56_dev" "mariadb")
+    ("pandoc-citeproc" "pandoc")
+    ("python3" "python-3")
     ("sqlite3" "sqlite")
+    ("svn" "subversion")
+    ("tcl/tk" "tcl")
     ("udunits-2" "udunits")
+    ("whoami" "coreutils")
     ("x11" "libx11")
     (_ sysname)))