summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-01-11 09:27:21 +0100
committerRicardo Wurmus <rekado@elephly.net>2019-01-12 23:35:11 +0100
commit91e05559bdf21b49686cc2629c44a6d0a6db0a61 (patch)
treeb9b896b4e8c8fa43071e80c4993eabcf828ab33f /guix
parent7e634c2f530767c63d0c5773b5aad2351034ede4 (diff)
import: cran: Suggest input changes.
* guix/import/cran.scm (latest-cran-release, latest-bioconductor-release): Return input-changes.
Diffstat (limited to 'guix')
-rw-r--r--guix/import/cran.scm29
1 files changed, 18 insertions, 11 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 15163bd165..b287be6941 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 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
@@ -390,11 +390,11 @@ s-expression corresponding to that package, or #f on failure."
(_ #f)))
(_ #f)))))
-(define (latest-cran-release package)
- "Return an <upstream-source> for the latest release of PACKAGE."
+(define (latest-cran-release pkg)
+ "Return an <upstream-source> for the latest release of the package PKG."
(define upstream-name
- (package->upstream-name package))
+ (package->upstream-name pkg))
(define meta
(fetch-description 'cran upstream-name))
@@ -403,15 +403,18 @@ s-expression corresponding to that package, or #f on failure."
(let ((version (assoc-ref meta "Version")))
;; CRAN does not provide signatures.
(upstream-source
- (package (package-name package))
+ (package (package-name pkg))
(version version)
- (urls (cran-uri upstream-name version))))))
+ (urls (cran-uri upstream-name version))
+ (input-changes
+ (changed-inputs pkg
+ (description->package 'cran meta)))))))
-(define (latest-bioconductor-release package)
- "Return an <upstream-source> for the latest release of PACKAGE."
+(define (latest-bioconductor-release pkg)
+ "Return an <upstream-source> for the latest release of the package PKG."
(define upstream-name
- (package->upstream-name package))
+ (package->upstream-name pkg))
(define version
(latest-bioconductor-package-version upstream-name))
@@ -419,9 +422,13 @@ s-expression corresponding to that package, or #f on failure."
(and version
;; Bioconductor does not provide signatures.
(upstream-source
- (package (package-name package))
+ (package (package-name pkg))
(version version)
- (urls (bioconductor-uri upstream-name version)))))
+ (urls (bioconductor-uri upstream-name version))
+ (input-changes
+ (changed-inputs
+ pkg
+ (cran->guix-package upstream-name 'bioconductor))))))
(define (cran-package? package)
"Return true if PACKAGE is an R package from CRAN."