kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

upstream: Make the 'updaters' parameter optional.

Browse Source 
* guix/upstream.scm (lookup-updater, package-latest-release)
(package-latest-release*, package-update): Make 'updaters' an optional
parameter.
* guix/lint.scm (check-for-updates): Remove second argument to
'package-latest-release*'.
This commit is contained in:
Ludovic Courtès 2021-01-06 18:37:52 +01:00
parent b793718cb4
commit 069bb95ab2
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/lint.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
@ -1183,7 +1183,7 @@ vulnerability records for PACKAGE by calling PACKAGE-VULNERABILITIES."
(format #f (G_ "while retrieving upstream info for '~a'") (format #f (G_ "while retrieving upstream info for '~a'")
(package-name package)) (package-name package))
#f #f
(package-latest-release* package (force %updaters))) (package-latest-release* package))
((? upstream-source? source) ((? upstream-source? source)
(if (version>? (upstream-source-version source) (if (version>? (upstream-source-version source)
(package-version package)) (package-version package))

16
guix/upstream.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
@ -248,7 +248,8 @@ correspond to the same version."
'() '()
(importer-modules)))) (importer-modules))))
(define (lookup-updater package updaters) (define* (lookup-updater package
#:optional (updaters (force %updaters)))
"Return an updater among UPDATERS that matches PACKAGE, or #f if none of "Return an updater among UPDATERS that matches PACKAGE, or #f if none of
them matches." them matches."
(find (match-lambda (find (match-lambda
@ -256,7 +257,9 @@ them matches."
(pred package))) (pred package)))
updaters)) updaters))
(define (package-latest-release package updaters) (define* (package-latest-release package
#:optional
(updaters (force %updaters)))
"Return an upstream source to update PACKAGE, a <package> object, or #f if "Return an upstream source to update PACKAGE, a <package> object, or #f if
none of UPDATERS matches PACKAGE. It is the caller's responsibility to ensure none of UPDATERS matches PACKAGE. It is the caller's responsibility to ensure
that the returned source is newer than the current one." that the returned source is newer than the current one."
@ -265,7 +268,9 @@ that the returned source is newer than the current one."
((upstream-updater-latest updater) package)) ((upstream-updater-latest updater) package))
(_ #f))) (_ #f)))
(define (package-latest-release* package updaters) (define* (package-latest-release* package
#:optional
(updaters (force %updaters)))
"Like 'package-latest-release', but ensure that the return source is newer "Like 'package-latest-release', but ensure that the return source is newer
than that of PACKAGE." than that of PACKAGE."
(match (package-latest-release package updaters) (match (package-latest-release package updaters)
@ -402,7 +407,8 @@ SOURCE, an <upstream-source>."
;; Mapping of origin methods to source update procedures. ;; Mapping of origin methods to source update procedures.
`((,url-fetch . ,package-update/url-fetch))) `((,url-fetch . ,package-update/url-fetch)))
(define* (package-update store package updaters (define* (package-update store package
#:optional (updaters (force %updaters))
#:key (key-download 'interactive)) #:key (key-download 'interactive))
"Return the new version, the file name of the new version tarball, and input "Return the new version, the file name of the new version tarball, and input
changes for PACKAGE; return #f (three values) when PACKAGE is up-to-date. changes for PACKAGE; return #f (three values) when PACKAGE is up-to-date.