From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#34040] [PATCH 2/2] import: cran: Suggest input changes. Resent-Message-ID: From: Ricardo Wurmus Message-ID: <20190111094208.28327-2-rekado@elephly.net> Date: Fri, 11 Jan 2019 10:42:08 +0100 In-Reply-To: <20190111094208.28327-1-rekado@elephly.net> References: <20190111094208.28327-1-rekado@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34040@debbugs.gnu.org Cc: Ricardo Wurmus * 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 =C2=A9 2015, 2016, 2017, 2018 Ricardo Wurmus +;;; Copyright =C2=A9 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2015, 2016, 2017 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2017 Mathieu Othacehe ;;; @@ -390,11 +390,11 @@ s-expression corresponding to that package, or #f on = failure." (_ #f))) (_ #f))))) =20 -(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." =20 (define upstream-name - (package->upstream-name package)) + (package->upstream-name pkg)) =20 (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))))))) =20 -(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." =20 (define upstream-name - (package->upstream-name package)) + (package->upstream-name pkg)) =20 (define version (latest-bioconductor-package-version upstream-name)) @@ -419,9 +422,13 @@ s-expression corresponding to that package, or #f on f= ailure." (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)))))) =20 (define (cran-package? package) "Return true if PACKAGE is an R package from CRAN." --=20 2.20.1