diff options
Diffstat (limited to 'guix/upstream.scm')
-rw-r--r-- | guix/upstream.scm | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/guix/upstream.scm b/guix/upstream.scm index 9300113ac6..c62667dd01 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,12 +40,14 @@ upstream-source-version upstream-source-urls upstream-source-signature-urls + upstream-source-archive-types coalesce-sources upstream-updater upstream-updater? upstream-updater-name + upstream-updater-description upstream-updater-predicate upstream-updater-latest @@ -95,8 +98,9 @@ correspond to the same version." (urls (append (upstream-source-urls release) (upstream-source-urls head))) (signature-urls - (append (upstream-source-signature-urls release) - (upstream-source-signature-urls head)))) + (let ((one (upstream-source-signature-urls release)) + (two (upstream-source-signature-urls release))) + (and one two (append one two))))) tail) (cons release result))) (() @@ -109,18 +113,19 @@ correspond to the same version." ;;; Auto-update. ;;; -(define-record-type <upstream-updater> - (upstream-updater name pred latest) +(define-record-type* <upstream-updater> + upstream-updater make-upstream-updater upstream-updater? - (name upstream-updater-name) - (pred upstream-updater-predicate) - (latest upstream-updater-latest)) + (name upstream-updater-name) + (description upstream-updater-description) + (pred upstream-updater-predicate) + (latest upstream-updater-latest)) (define (lookup-updater package updaters) "Return an updater among UPDATERS that matches PACKAGE, or #f if none of them matches." (any (match-lambda - (($ <upstream-updater> _ pred latest) + (($ <upstream-updater> _ _ pred latest) (and (pred package) latest))) updaters)) |