summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2022-10-22 10:37:50 +0200
committerRicardo Wurmus <rekado@elephly.net>2022-12-31 14:48:46 +0100
commit952953be39527ec315e95e039f27d9bdc020d37e (patch)
tree0960e13f2ae0ee0793073a94673f3db47ac901da /guix
parent1176fccb83d1e9d4232f2fae2b661a7f29f76060 (diff)
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.
Diffstat (limited to 'guix')
-rw-r--r--guix/import/cran.scm24
1 files changed, 22 insertions, 2 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 @@ empty list when the FIELD cannot be found."
"c++11"
"c++14"
"c++17"
+ "c99"
"getopt::long"
+ "gnu"
"posix.1-2001"
"linux"
"none"
@@ -406,15 +408,33 @@ empty list when the FIELD cannot be found."
(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")
("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)))