From 7d27a0259bc7a37c04b17ffc2953837fcc3e75ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Apr 2016 21:40:20 +0200 Subject: upstream: Pass a package object to updaters. * guix/upstream.scm (package-update-path): Pass PACKAGE to 'latest-release'. * guix/gnu-maintenance.scm (latest-release*) (latest-gnome-release, latest-xorg-release): Adjust accordingly. * guix/import/cran.scm (latest-cran-release): (latest-bioconductor-release): Likewise. * guix/import/elpa.scm (latest-release): Likewise. * guix/import/gem.scm (latest-release): Likewise. * guix/import/github.scm (latest-release): Likewise. * guix/import/hackage.scm (latest-release): Likewise. * guix/import/pypi.scm (latest-release): Likewise. --- guix/gnu-maintenance.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'guix/gnu-maintenance.scm') diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 9d720ca030..f97f2d1692 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -33,7 +33,6 @@ #:use-module (guix records) #:use-module (guix upstream) #:use-module (guix packages) - #:use-module (gnu packages) #:export (gnu-package-name gnu-package-mundane-name gnu-package-copyright-holder @@ -435,7 +434,7 @@ of EXP otherwise." "Like 'latest-release', but ignore FTP errors that might occur when PACKAGE is not actually a GNU package, or not hosted on ftp.gnu.org, or not under that name (this is the case for \"emacs-auctex\", for instance.)" - (false-if-ftp-error (latest-release package))) + (false-if-ftp-error (latest-release (package-name package)))) (define %package-name-rx ;; Regexp for a package name, e.g., "foo-X.Y". Since TeXmacs uses @@ -493,10 +492,10 @@ elpa.gnu.org, and all the GNOME packages." (even-minor-version? (or version name)))) (false-if-ftp-error - (latest-ftp-release package + (latest-ftp-release (package-name package) #:server "ftp.gnome.org" #:directory (string-append "/pub/gnome/sources/" - (match package + (match (package-name package) ("gconf" "GConf") (x x))) @@ -528,10 +527,10 @@ elpa.gnu.org, and all the GNOME packages." (define (latest-xorg-release package) "Return the latest release of PACKAGE, the name of an X.org package." - (let ((uri (string->uri (origin-uri (package-source (specification->package package)))))) + (let ((uri (string->uri (origin-uri (package-source package))))) (false-if-ftp-error (latest-ftp-release - package + (package-name package) #:server "ftp.freedesktop.org" #:directory (string-append "/pub/xorg/" (dirname (uri-path uri))))))) -- cgit v1.2.3