From patchwork Thu Jul 25 03:13:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Andrews X-Patchwork-Id: 14772 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CA11317275; Thu, 25 Jul 2019 14:14:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8B2B317273 for ; Thu, 25 Jul 2019 14:14:37 +0100 (BST) Received: from localhost ([::1]:60062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqdZt-0002KG-8Y for patchwork@mira.cbaines.net; Thu, 25 Jul 2019 09:14:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45093) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqUgi-0000IT-SE for guix-patches@gnu.org; Wed, 24 Jul 2019 23:45:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqUgh-0000aW-PZ for guix-patches@gnu.org; Wed, 24 Jul 2019 23:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hqUgh-0000aS-Kg for guix-patches@gnu.org; Wed, 24 Jul 2019 23:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hqUgh-0002a2-F2 for guix-patches@gnu.org; Wed, 24 Jul 2019 23:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36805] Small patch to remove TODO for (@@ (guix build-system r) bioconductor-uri) Resent-From: Kyle Andrews Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jul 2019 03:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36805 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36805@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15640262499834 (code B ref -1); Thu, 25 Jul 2019 03:45:03 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jul 2019 03:44:09 +0000 Received: from localhost ([127.0.0.1]:38248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hqUfo-0002YX-St for submit@debbugs.gnu.org; Wed, 24 Jul 2019 23:44:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:37832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hqUCV-0001pl-Pd for submit@debbugs.gnu.org; Wed, 24 Jul 2019 23:13:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38702) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqUCU-0001fe-Jv for guix-patches@gnu.org; Wed, 24 Jul 2019 23:13:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqUCT-0006HW-Fq for guix-patches@gnu.org; Wed, 24 Jul 2019 23:13:50 -0400 Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]:37337) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hqUCT-0006HN-Av for guix-patches@gnu.org; Wed, 24 Jul 2019 23:13:49 -0400 Received: by mail-io1-xd29.google.com with SMTP id q22so94105842iog.4 for ; Wed, 24 Jul 2019 20:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:date:mime-version; bh=mcby5qe/LKRNazi49Drmh7DNKI96aqNrrlTRrrQhzoc=; b=nQvikzzol1I2+QveERY1Sv7BYOhRCxYgF32L9IRLmEFP7KdsNVPN/euOMWaKevnqB0 cMTc2stP2n+8FyFXTzV3AwrsdkG/BgZLCGCBHyOFlSW3CYYa0WFlPUJ0VMm8+723Ev4j 7B0SU9KPmtBYt71PbOmrn1ucxHbiDO/psv2yTS/S4qPO4VYVrkaAFcU4C+ZKydlK7z7l IinFoxcawaZRIlq9i3kWH0ADLzCIpA9NcUG3lcLD8MXTXJFbW+qLng4Xx+fPrXAvt/Y0 /34IctfDPeRTTQPJQEzTzXF5HtSCr+Ckks8OmX23Cgs+tjAtEJ1qjvNRzpO06ZHlPPE9 r2Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:date:mime-version; bh=mcby5qe/LKRNazi49Drmh7DNKI96aqNrrlTRrrQhzoc=; b=XnBnh2meFXwxHf1v8pqq/ycWC0LtQCtENrWPWkCon5MNsvwJ58Ey/xklB+qnpQr5/o pa7bOAh1yZtLu/dCuhKgmmSHnvqP/f4FA/UsIzpZ7ImnhB6n0CZ8hdT2QhVAn5Gxfz1d 1KoPNEYzQoK3zDfTtkJfnT+Z8cn/dz+FHYsN1BpK2S8QlO1L4OTwYIChXSGoY8x41ROw sxYkCYugF2jKRWSe1LsANjhhrIYqfm40PI349Bpq7Wk38NItpEFBDf9+4HpfbIp4rsZx NLay9oJR2dzgK/nhDM8CAzkBCOCu6pOZlj53k9a9YzEO2YQsknLVaqmYl60798cixznf VE5w== X-Gm-Message-State: APjAAAXv0vuSJWhIe5ifoy0w+gxZusitSDtcKi414othFJTHaxgce6kp RjL1J6CO6CobyoS2PDnEeI2jg2ZcLMY= X-Google-Smtp-Source: APXvYqxVCb8JeI+UY7BJGFdc4Vo2ef7c4db90cakUHJsDwsknD0p1dGlYTIHHVPhr3+MBKOX9akT1Q== X-Received: by 2002:a02:54c1:: with SMTP id t184mr57992719jaa.10.1564024428169; Wed, 24 Jul 2019 20:13:48 -0700 (PDT) Received: from [192.168.2.52] (96-35-65-255.dhcp.bycy.mi.charter.com. [96.35.65.255]) by smtp.googlemail.com with ESMTPSA id a7sm38486880iok.19.2019.07.24.20.13.47 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 20:13:47 -0700 (PDT) Message-ID: <92658660d50853e4eec92f536d8b3eb720aab911.camel@gmail.com> From: Kyle Andrews Date: Wed, 24 Jul 2019 23:13:46 -0400 X-Mailer: Evolution 3.28.1 Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Mailman-Approved-At: Wed, 24 Jul 2019 23:44:07 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Thu, 25 Jul 2019 09:14:34 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, I am a heavy R user trying to get my feet wet with guix. Here is a patch to remove the hard-coded bioconductor release by adding an optional 3rd argument to the function with an appropriate default value. I hope this is helpful. Regards, Kyle Andrews From 729e621cc2175864937b6a4a3e754bd128ac9056 Mon Sep 17 00:00:00 2001 From: Kyle Andrews Date: Wed, 24 Jul 2019 22:51:20 -0400 Subject: [PATCH] NAME and VERSION are not enough for Bioconductor URI. Need RELEASE. --- guix/build-system/r.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index fbf08d3aa7..93b2f2f14f 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -47,13 +47,14 @@ available via the first URI, the second URI points to the archived version." (string-append "mirror://cran/src/contrib/Archive/" name "/" name "_" version ".tar.gz"))) -(define (bioconductor-uri name version) +(define* (bioconductor-uri name version + #:optional + (release (@@ (guix import cran) %bioconductor-version))) "Return a URI string for the R package archive on Bioconductor for the -release corresponding to NAME and VERSION." +release corresponding to NAME, package VERSION, and Bioconductor RELEASE." (list (string-append "https://bioconductor.org/packages/release/bioc/src/contrib/" name "_" version ".tar.gz") - (string-append "https://bioconductor.org/packages/" - (@@ (guix import cran) %bioconductor-version) + (string-append "https://bioconductor.org/packages/" release "/bioc/src/contrib/Archive/" name "_" version ".tar.gz"))) -- 2.22.0