TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

import/cran: Fix calls to CRAN->GUIX-PACKAGE.

Browse source 
* guix/import/cran.scm (cran->guix-package, latest-bioconductor-release):
Invoke CRAN->GUIX-PACKAGE with #:REPO keyword argument.
This commit is contained in:
Ricardo Wurmus 2020-12-04 12:27:29 +01:00
parent a6805ad0b8
commit a689c85af4
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
guix/import/cran.scm
View file

@ -578,13 +578,13 @@ (define cran->guix-package
(case repo (case repo
((git) ((git)
;; Retry import from Bioconductor ;; Retry import from Bioconductor
(cran->guix-package package-name 'bioconductor)) (cran->guix-package package-name #:repo 'bioconductor))
((hg) ((hg)
;; Retry import from Bioconductor ;; Retry import from Bioconductor
(cran->guix-package package-name 'bioconductor)) (cran->guix-package package-name #:repo 'bioconductor))
((bioconductor) ((bioconductor)
;; Retry import from CRAN ;; Retry import from CRAN
(cran->guix-package package-name 'cran)) (cran->guix-package package-name #:repo 'cran))
(else (values #f '())))))))) (else (values #f '()))))))))
(define* (cran-recursive-import package-name #:key (repo 'cran)) (define* (cran-recursive-import package-name #:key (repo 'cran))
@ -655,7 +655,7 @@ (define version
(input-changes (input-changes
(changed-inputs (changed-inputs
pkg pkg
(cran->guix-package upstream-name 'bioconductor)))))) (cran->guix-package upstream-name #:repo 'bioconductor))))))
(define (cran-package? package) (define (cran-package? package)
"Return true if PACKAGE is an R package from CRAN." "Return true if PACKAGE is an R package from CRAN."