summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2019-09-16 14:34:15 +0300
committerEfraim Flashner <efraim@flashner.co.il>2019-09-16 14:34:15 +0300
commit74e7465c9b3758c1509a3e0dbe575e2014e20f0a (patch)
tree02de38f02d73acfc40a1363236ec9dbcc537a594
parent518fd3b6592203df73fec347d30016d4260ee127 (diff)
downloadguix-74e7465c9b3758c1509a3e0dbe575e2014e20f0a.tar.gz
Revert "build-system/r: Use %bioconductor-version."
This reverts commit 41ca406fa54e69f61c55b11ffe5cf465192a907c.

This commit breaks 'guix pull', as reported by Hao Chen.
-rw-r--r--guix/build-system/r.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm
index 936ad974d0..dd2a9fe8de 100644
--- a/guix/build-system/r.scm
+++ b/guix/build-system/r.scm
@@ -1,5 +1,5 @@
 ;;; 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.
 ;;;
@@ -24,7 +24,6 @@
   #:use-module (guix search-paths)
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix import cran) #:select (%bioconductor-version))
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-26)
   #:export (%r-build-system-modules
@@ -59,8 +58,8 @@ release corresponding to NAME and VERSION."
                          type-url-part
                          "/src/contrib/"
                          name "_" version ".tar.gz")
-          (string-append "https://bioconductor.org/packages/"
-                         %bioconductor-version
+          ;; TODO: use %bioconductor-version from (guix import cran)
+          (string-append "https://bioconductor.org/packages/3.9"
                          type-url-part
                          "/src/contrib/Archive/"
                          name "_" version ".tar.gz"))))