From patchwork Fri Jan 11 09:42:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 718 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 4D76C16A5F; Fri, 11 Jan 2019 09:43:06 +0000 (GMT) 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,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham 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 C9E9516A1E for ; Fri, 11 Jan 2019 09:43:05 +0000 (GMT) Received: from localhost ([127.0.0.1]:46393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghtLF-000658-02 for patchwork@mira.cbaines.net; Fri, 11 Jan 2019 04:43:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghtLD-000650-3P for guix-patches@gnu.org; Fri, 11 Jan 2019 04:43:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghtLC-0001lY-9w for guix-patches@gnu.org; Fri, 11 Jan 2019 04:43:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghtLC-0001lU-6T for guix-patches@gnu.org; Fri, 11 Jan 2019 04:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ghtLC-0006Pk-28 for guix-patches@gnu.org; Fri, 11 Jan 2019 04:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34040] [PATCH 2/2] import: cran: Suggest input changes. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Jan 2019 09:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34040 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 34040@debbugs.gnu.org Received: via spool by 34040-submit@debbugs.gnu.org id=B34040.154719975924619 (code B ref 34040); Fri, 11 Jan 2019 09:43:02 +0000 Received: (at 34040) by debbugs.gnu.org; 11 Jan 2019 09:42:39 +0000 Received: from localhost ([127.0.0.1]:54623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ghtKp-0006P1-4e for submit@debbugs.gnu.org; Fri, 11 Jan 2019 04:42:39 -0500 Received: from sender-of-o53.zoho.com ([135.84.80.218]:21771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ghtKm-0006Ol-4R for 34040@debbugs.gnu.org; Fri, 11 Jan 2019 04:42:37 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1547199740; cv=none; d=zoho.com; s=zohoarc; b=HLpjriIQ2B/ILEViTZczm8RIjVaAlw2/6Gr4w6MlXcZWkhiLxbWh3hkqCjfZZrCwcJOKRmQBHF769U6lh8v6kI5KrvMjENq2R5PJLdirSxXUbaN+i6WoOsOkYOJv8o1q+wTuQraWao5/TlDC/I86GkAG5ld2OroZhmQLNjS5kNs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1547199740; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=ve92ItC6KKUpqkvenHbkzCCc4tiucmwj4/KxMJ6YSVI=; b=Kgrl4xCadEwuunPC+E1hN4R502b5RTCBtW5pQgztPWrJFCVrHLrO0/6oO2Cb61h2yN0V7Cxgwn6kAbp5DY/BO7Q6QqGf3PHIpw+y5Yqvexk0KWQPcq0QW0x8Kmp6jM+s8B3qYw8WwlYxWr8Qm0eowoElGGdP8hzVy0eT7ZgDWy0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1547199740; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; l=2709; bh=ve92ItC6KKUpqkvenHbkzCCc4tiucmwj4/KxMJ6YSVI=; b=YrMi1ffbcBBnuXtlHhNMhx34MztUmolnn4EhfVSusPclzi8XPyhPUBL98vIXZ46z t6nOc6uL/kCjDrTeoyuiPWW8W9WmsDfwumtS5FtQTM6xg6SgEKvG+lQd6Nm7wlWRcJb vJYODOlClKJeB/VXKRXAQOA7DhSQf4KLBOlJXGuY= Received: from localhost (141.80.247.176 [141.80.247.176]) by mx.zohomail.com with SMTPS id 15471997394669.671673298095357; Fri, 11 Jan 2019 01:42:19 -0800 (PST) From: Ricardo Wurmus Message-ID: <20190111094208.28327-2-rekado@elephly.net> Date: Fri, 11 Jan 2019 10:42:08 +0100 X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111094208.28327-1-rekado@elephly.net> References: <20190111094208.28327-1-rekado@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External 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-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ricardo Wurmus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/import/cran.scm (latest-cran-release, latest-bioconductor-release): Return input-changes. --- guix/import/cran.scm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 15163bd16..b287be694 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 +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; @@ -390,11 +390,11 @@ s-expression corresponding to that package, or #f on failure." (_ #f))) (_ #f))))) -(define (latest-cran-release package) - "Return an for the latest release of PACKAGE." +(define (latest-cran-release pkg) + "Return an 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 for the latest release of PACKAGE." +(define (latest-bioconductor-release pkg) + "Return an 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."