kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

import/cran: description->package: Use COND and computed booleans.

Browse Source 
* guix/import/cran.scm (description->package): Use COND with previously
computed booleans instead of using CASE on REPOSITORY.
This commit is contained in:
Ricardo Wurmus 2022-08-12 19:59:50 +02:00
parent 8c620a6036
commit ec92bcaadd
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
guix/import/cran.scm
View File

@ -516,32 +516,32 @@ from the alist META, which was derived from the R package's DESCRIPTION file."
(package (package
`(package `(package
(name ,(cran-guix-name name)) (name ,(cran-guix-name name))
(version ,(case repository (version ,(cond
((git) (git?
`(git-version ,version revision commit)) `(git-version ,version revision commit))
((hg) (hg?
`(string-append ,version "-" revision "." changeset)) `(string-append ,version "-" revision "." changeset))
(else version))) (else version)))
(source (origin (source (origin
(method ,(cond (method ,(cond
(git? 'git-fetch) (git? 'git-fetch)
(hg? 'hg-fetch) (hg? 'hg-fetch)
(else 'url-fetch))) (else 'url-fetch)))
(uri ,(case repository (uri ,(cond
((git) (git?
`(git-reference `(git-reference
(url ,(assoc-ref meta 'git)) (url ,(assoc-ref meta 'git))
(commit commit))) (commit commit)))
((hg) (hg?
`(hg-reference `(hg-reference
(url ,(assoc-ref meta 'hg)) (url ,(assoc-ref meta 'hg))
(changeset changeset))) (changeset changeset)))
(else (else
`(,(procedure-name uri-helper) ,name version `(,(procedure-name uri-helper) ,name version
,@(or (and=> (assoc-ref meta 'bioconductor-type) ,@(or (and=> (assoc-ref meta 'bioconductor-type)
(lambda (type) (lambda (type)
(list (list 'quote type)))) (list (list 'quote type))))
'()))))) '())))))
,@(cond ,@(cond
(git? (git?
'((file-name (git-file-name name version)))) '((file-name (git-file-name name version))))
@ -576,16 +576,16 @@ from the alist META, which was derived from the R package's DESCRIPTION file."
""))) "")))
(license ,license)))) (license ,license))))
(values (values
(case repository (cond
((git) (git?
`(let ((commit ,(assoc-ref meta 'git-commit)) `(let ((commit ,(assoc-ref meta 'git-commit))
(revision "1")) (revision "1"))
,package)) ,package))
((hg) (hg?
`(let ((changeset ,(assoc-ref meta 'hg-changeset)) `(let ((changeset ,(assoc-ref meta 'hg-changeset))
(revision "1")) (revision "1"))
,package)) ,package))
(else package)) (else package))
propagate))) propagate)))
(define cran->guix-package (define cran->guix-package