ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* guix/import/cran.scm (invalid-packages): Add "build-essential".
(transform-sysname): Add aliases for openssl, libxml2, and zlib.

Change-Id: Ia142ebc388dbcd47caf3b2c5165bc21227bc1832
This commit is contained in:
Ricardo Wurmus 2024-01-16 19:40:50 +01:00
parent 9a9f05f1f2
commit 171ac4fa4f
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
guix/import/cran.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2015-2017, 2019-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
@ -400,7 +400,8 @@ (define default-r-packages
;; The field for system dependencies is often abused to specify non-package ;; The field for system dependencies is often abused to specify non-package
;; dependencies (such as c++11). This list is used to ignore them. ;; dependencies (such as c++11). This list is used to ignore them.
(define invalid-packages (define invalid-packages
(list "c++" (list "build-essential"
"c++"
"c++11" "c++11"
"c++14" "c++14"
"c++17" "c++17"
@ -435,11 +436,17 @@ (define (transform-sysname sysname)
("libjpeg" "libjpeg-turbo") ("libjpeg" "libjpeg-turbo")
("liblz4" "lz4") ("liblz4" "lz4")
("liblzma" "xz") ("liblzma" "xz")
("libssl-dev" "openssl")
("libssl_dev" "openssl")
("libzstd" "zstd") ("libzstd" "zstd")
("libxml2-devel" "libxml2") ("libxml2-devel" "libxml2")
("libxml2-dev" "libxml2")
("libz" "zlib") ("libz" "zlib")
("libz-dev" "zlib")
("mariadb-devel" "mariadb") ("mariadb-devel" "mariadb")
("mysql56_dev" "mariadb") ("mysql56_dev" "mariadb")
("openssl-devel" "openssl")
("openssl@1.1" "openssl-1.1")
("pandoc-citeproc" "pandoc") ("pandoc-citeproc" "pandoc")
("python3" "python-3") ("python3" "python-3")
("sqlite3" "sqlite") ("sqlite3" "sqlite")
@ -450,6 +457,7 @@ (define (transform-sysname sysname)
("x11" "libx11") ("x11" "libx11")
("xml2" "libxml2") ("xml2" "libxml2")
("zlib-devel" "zlib") ("zlib-devel" "zlib")
("zlib1g-dev" "zlib")
(_ sysname))) (_ sysname)))
(define cran-guix-name (cut guix-name "r-" <>)) (define cran-guix-name (cut guix-name "r-" <>))