Merge branch 'master' into core-updates

This commit is contained in:
Ricardo Wurmus 2019-10-06 22:02:20 +02:00
commit e08902d3cb
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
65 changed files with 46438 additions and 628 deletions

View file

@ -8407,6 +8407,13 @@ library implementing most of the pipeline's features.")
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'find-RCAS
;; The configure script can't find non-1.3.x versions of RCAS because
;; its R expression 1.10.1 >= 1.3.4 evaluates to false.
(lambda _
(substitute* "configure"
(("1\\.3\\.4") "0.0.0"))
#t))
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))