branch master updated: import/cran: Add more invalid package names and translations.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 171ac4fa4f import/cran: Add more invalid package names and 
translations.
171ac4fa4f is described below

commit 171ac4fa4f5e5dd2f2e110487de5d41b5b79a564
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Jan 16 19:40:50 2024 +0100

    import/cran: Add more invalid package names and translations.
    
    * guix/import/cran.scm (invalid-packages): Add "build-essential".
    (transform-sysname): Add aliases for openssl, libxml2, and zlib.
    
    Change-Id: Ia142ebc388dbcd47caf3b2c5165bc21227bc1832
---
 guix/import/cran.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index fe1d32d79a..5995e6a5ce 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015-2024 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015-2017, 2019-2021, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
@@ -400,7 +400,8 @@ empty list when the FIELD cannot be found."
 ;; The field for system dependencies is often abused to specify non-package
 ;; dependencies (such as c++11).  This list is used to ignore them.
 (define invalid-packages
-  (list "c++"
+  (list "build-essential"
+        "c++"
         "c++11"
         "c++14"
         "c++17"
@@ -435,11 +436,17 @@ empty list when the FIELD cannot be found."
     ("libjpeg" "libjpeg-turbo")
     ("liblz4" "lz4")
     ("liblzma" "xz")
+    ("libssl-dev" "openssl")
+    ("libssl_dev" "openssl")
     ("libzstd" "zstd")
     ("libxml2-devel" "libxml2")
+    ("libxml2-dev" "libxml2")
     ("libz" "zlib")
+    ("libz-dev" "zlib")
     ("mariadb-devel" "mariadb")
     ("mysql56_dev" "mariadb")
+    ("openssl-devel" "openssl")
+    ("openssl@1.1" "openssl-1.1")
     ("pandoc-citeproc" "pandoc")
     ("python3" "python-3")
     ("sqlite3" "sqlite")
@@ -450,6 +457,7 @@ empty list when the FIELD cannot be found."
     ("x11" "libx11")
     ("xml2" "libxml2")
     ("zlib-devel" "zlib")
+    ("zlib1g-dev" "zlib")
     (_ sysname)))
 
 (define cran-guix-name (cut guix-name "r-" <>))