guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 01/01: Revert "build-system/r: Use %bioconductor-version."
Date: Mon, 16 Sep 2019 07:35:30 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit 74e7465c9b3758c1509a3e0dbe575e2014e20f0a
Author: Efraim Flashner <address@hidden>
Date:   Mon Sep 16 14:34:15 2019 +0300

    Revert "build-system/r: Use %bioconductor-version."
    
    This reverts commit 41ca406fa54e69f61c55b11ffe5cf465192a907c.
    
    This commit breaks 'guix pull', as reported by Hao Chen.
---
 guix/build-system/r.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm
index 936ad97..dd2a9fe 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 <address@hidden>
+;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; 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"))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]