diff options
| author | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
| commit | 388bd35dd0df2d231bc2cce3746d7d5fd15df23a (patch) | |
| tree | 82e7cc45b8279f83439214c7c79dc7161ffda94d /guix/import/cran.scm | |
| parent | f1c7c2f697877fcb68b53ea062ff8a88f274a2fe (diff) | |
| parent | d00380b0077b0df2a0b790bb115d07c1533b8863 (diff) | |
| download | guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar.gz | |
Merge branch 'master' into staging-next
Diffstat (limited to 'guix/import/cran.scm')
| -rw-r--r-- | guix/import/cran.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm index fd44d80915..e8caf080fd 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> @@ -341,7 +341,11 @@ 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++11")) + (list "c++11" + "c++14" + "linux" + "getopt::long" + "xquartz")) (define cran-guix-name (cut guix-name "r-" <>)) |