me
/
guix
Archived
1
0
Fork 0
Code

Revert "build-system/r: Use %bioconductor-version." 

This reverts commit 41ca406fa5.

This commit breaks 'guix pull', as reported by Hao Chen.
master
Efraim Flashner 2019-09-16 14:34:15 +03:00
parent 518fd3b659
commit 74e7465c9b
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/build-system/r.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,7 +24,6 @@
#:use-module (guix search-paths) #:use-module (guix search-paths)
#:use-module (guix build-system) #:use-module (guix build-system)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix import cran) #:select (%bioconductor-version))
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:export (%r-build-system-modules #:export (%r-build-system-modules
@ -59,8 +58,8 @@ release corresponding to NAME and VERSION."
type-url-part type-url-part
"/src/contrib/" "/src/contrib/"
name "_" version ".tar.gz") name "_" version ".tar.gz")
(string-append "https://bioconductor.org/packages/" ;; TODO: use %bioconductor-version from (guix import cran)
%bioconductor-version (string-append "https://bioconductor.org/packages/3.9"
type-url-part type-url-part
"/src/contrib/Archive/" "/src/contrib/Archive/"
name "_" version ".tar.gz")))) name "_" version ".tar.gz"))))