mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-06 23:16:13 -05:00
upstream-updater: Rename record field.
The next commits will make the functions, which are currently importing the latest version of a package, change into importing the latest or a given version of the package (for those updaters supporting specifying a version). Thus the name ‘latest‘ is no longer appropriate. * guix/upstream.scm (upstream-updater) Rename field [latest] to [import]. (lookup-updater, package-latest-release) Adjust fieldname accordingly. * guix/gnu-maintenance.scm (%gnu-updater, %gnu-ftp-updater, %savannah-updater, %sourceforge-updater, %xorg-updater, %kernel.org-updater, %generic-html-updater), guix/import/cpan.scm (%cpan-updater), guix/import/cran.scm (%cran-updater, %bioconductor-updater), guix/import/crate.scm (%crate-updater), guix/import/egg.scm (%egg-updater), guix/import/elpa.scm (%elpa-updater), guix/import/gem.scm (%gem-updater), guix/import/git.scm (%generic-git-updater), guix/import/github.scm (%github-updater), guix/import/gnome.scm (%gnome-updater), guix/import/hackage.scm (%hackage-updater), guix/import/hexpm.scm (%hexpm-updater), guix/import/kde.scm (%kde-updater), guix/import/launchpad.scm (%launchpad-updater), guix/import/minetest.scm (%minetest-updater), guix/import/opam.scm (%opam-updater), guix/import/pypi.scm (%pypi-updater), guix/import/stackage.scm (%stackage-updater), tests/import-github.scm (found-sexp) tests/transformations.scm ("options->transformation, with-latest"): Adjust fieldname accordingly.
This commit is contained in:
parent
c50cd1bbec
commit
a274a6a1ac
21 changed files with 35 additions and 35 deletions
|
@ -848,7 +848,7 @@ (define %gnu-updater
|
|||
(name 'gnu)
|
||||
(description "Updater for GNU packages")
|
||||
(pred gnu-hosted?)
|
||||
(latest latest-gnu-release)))
|
||||
(import latest-gnu-release)))
|
||||
|
||||
(define %gnu-ftp-updater
|
||||
;; This is for GNU packages taken from alternate locations, such as
|
||||
|
@ -859,41 +859,41 @@ (define %gnu-ftp-updater
|
|||
(pred (lambda (package)
|
||||
(and (not (gnu-hosted? package))
|
||||
(pure-gnu-package? package))))
|
||||
(latest latest-release*)))
|
||||
(import latest-release*)))
|
||||
|
||||
(define %savannah-updater
|
||||
(upstream-updater
|
||||
(name 'savannah)
|
||||
(description "Updater for packages hosted on savannah.gnu.org")
|
||||
(pred (url-prefix-predicate "mirror://savannah/"))
|
||||
(latest latest-savannah-release)))
|
||||
(import latest-savannah-release)))
|
||||
|
||||
(define %sourceforge-updater
|
||||
(upstream-updater
|
||||
(name 'sourceforge)
|
||||
(description "Updater for packages hosted on sourceforge.net")
|
||||
(pred (url-prefix-predicate "mirror://sourceforge/"))
|
||||
(latest latest-sourceforge-release)))
|
||||
(import latest-sourceforge-release)))
|
||||
|
||||
(define %xorg-updater
|
||||
(upstream-updater
|
||||
(name 'xorg)
|
||||
(description "Updater for X.org packages")
|
||||
(pred (url-prefix-predicate "mirror://xorg/"))
|
||||
(latest latest-xorg-release)))
|
||||
(import latest-xorg-release)))
|
||||
|
||||
(define %kernel.org-updater
|
||||
(upstream-updater
|
||||
(name 'kernel.org)
|
||||
(description "Updater for packages hosted on kernel.org")
|
||||
(pred (url-prefix-predicate "mirror://kernel.org/"))
|
||||
(latest latest-kernel.org-release)))
|
||||
(import latest-kernel.org-release)))
|
||||
|
||||
(define %generic-html-updater
|
||||
(upstream-updater
|
||||
(name 'generic-html)
|
||||
(description "Updater that crawls HTML pages.")
|
||||
(pred html-updatable-package?)
|
||||
(latest latest-html-updatable-release)))
|
||||
(import latest-html-updatable-release)))
|
||||
|
||||
;;; gnu-maintenance.scm ends here
|
||||
|
|
|
@ -358,4 +358,4 @@ (define %cpan-updater
|
|||
(name 'cpan)
|
||||
(description "Updater for CPAN packages")
|
||||
(pred cpan-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
|
|
@ -776,13 +776,13 @@ (define %cran-updater
|
|||
(name 'cran)
|
||||
(description "Updater for CRAN packages")
|
||||
(pred cran-package?)
|
||||
(latest latest-cran-release)))
|
||||
(import latest-cran-release)))
|
||||
|
||||
(define %bioconductor-updater
|
||||
(upstream-updater
|
||||
(name 'bioconductor)
|
||||
(description "Updater for Bioconductor packages")
|
||||
(pred bioconductor-package?)
|
||||
(latest latest-bioconductor-release)))
|
||||
(import latest-bioconductor-release)))
|
||||
|
||||
;;; cran.scm ends here
|
||||
|
|
|
@ -370,5 +370,5 @@ (define %crate-updater
|
|||
(name 'crate)
|
||||
(description "Updater for crates.io packages")
|
||||
(pred crate-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
||||
|
|
|
@ -348,6 +348,6 @@ (define %egg-updater
|
|||
(name 'egg)
|
||||
(description "Updater for CHICKEN egg packages")
|
||||
(pred egg-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
||||
;;; egg.scm ends here
|
||||
|
|
|
@ -444,7 +444,7 @@ (define %elpa-updater
|
|||
(name 'elpa)
|
||||
(description "Updater for ELPA packages")
|
||||
(pred package-from-elpa-repository?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
||||
(define elpa-guix-name (cut guix-name "emacs-" <>))
|
||||
|
||||
|
|
|
@ -189,7 +189,7 @@ (define %gem-updater
|
|||
(name 'gem)
|
||||
(description "Updater for RubyGem packages")
|
||||
(pred gem-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
||||
(define* (gem-recursive-import package-name #:optional version)
|
||||
(recursive-import package-name
|
||||
|
|
|
@ -226,4 +226,4 @@ (define %generic-git-updater
|
|||
(name 'generic-git)
|
||||
(description "Updater for packages hosted on Git repositories")
|
||||
(pred git-package?)
|
||||
(latest latest-git-release)))
|
||||
(import latest-git-release)))
|
||||
|
|
|
@ -330,6 +330,6 @@ (define %github-updater
|
|||
(name 'github)
|
||||
(description "Updater for GitHub packages")
|
||||
(pred github-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
||||
|
||||
|
|
|
@ -130,4 +130,4 @@ (define %gnome-updater
|
|||
(name 'gnome)
|
||||
(description "Updater for GNOME packages")
|
||||
(pred (url-prefix-predicate "mirror://gnome/"))
|
||||
(latest latest-gnome-release)))
|
||||
(import latest-gnome-release)))
|
||||
|
|
|
@ -381,6 +381,6 @@ (define %hackage-updater
|
|||
(name 'hackage)
|
||||
(description "Updater for Hackage packages")
|
||||
(pred hackage-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
||||
;;; cabal.scm ends here
|
||||
|
|
|
@ -344,4 +344,4 @@ (define %hexpm-updater
|
|||
(name 'hexpm)
|
||||
(description "Updater for hex.pm packages")
|
||||
(pred (url-prefix-predicate hexpm-package-url))
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
|
|
@ -187,4 +187,4 @@ (define %kde-updater
|
|||
(name 'kde)
|
||||
(description "Updater for KDE packages")
|
||||
(pred (url-prefix-predicate "mirror://kde/"))
|
||||
(latest latest-kde-release)))
|
||||
(import latest-kde-release)))
|
||||
|
|
|
@ -145,4 +145,4 @@ (define %launchpad-updater
|
|||
(name 'launchpad)
|
||||
(description "Updater for Launchpad packages")
|
||||
(pred launchpad-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
|
|
@ -513,4 +513,4 @@ (define %minetest-updater
|
|||
(name 'minetest)
|
||||
(description "Updater for Minetest packages on ContentDB")
|
||||
(pred minetest-package?)
|
||||
(latest latest-minetest-release)))
|
||||
(import latest-minetest-release)))
|
||||
|
|
|
@ -435,4 +435,4 @@ (define %opam-updater
|
|||
(name 'opam)
|
||||
(description "Updater for OPAM packages")
|
||||
(pred opam-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
|
|
@ -583,4 +583,4 @@ (define %pypi-updater
|
|||
(name 'pypi)
|
||||
(description "Updater for PyPI packages")
|
||||
(pred pypi-package?)
|
||||
(latest latest-release)))
|
||||
(import latest-release)))
|
||||
|
|
|
@ -175,6 +175,6 @@ (define %stackage-updater
|
|||
(name 'stackage)
|
||||
(description "Updater for Stackage LTS packages")
|
||||
(pred stackage-lts-package?)
|
||||
(latest latest-lts-release)))
|
||||
(import latest-lts-release)))
|
||||
|
||||
;;; stackage.scm ends here
|
||||
|
|
|
@ -66,7 +66,7 @@ (define-module (guix upstream)
|
|||
upstream-updater-name
|
||||
upstream-updater-description
|
||||
upstream-updater-predicate
|
||||
upstream-updater-latest
|
||||
upstream-updater-import
|
||||
|
||||
upstream-input-change?
|
||||
upstream-input-change-name
|
||||
|
@ -241,7 +241,7 @@ (define-record-type* <upstream-updater>
|
|||
(name upstream-updater-name)
|
||||
(description upstream-updater-description)
|
||||
(pred upstream-updater-predicate)
|
||||
(latest upstream-updater-latest))
|
||||
(import upstream-updater-import))
|
||||
|
||||
(define (importer-modules)
|
||||
"Return the list of importer modules."
|
||||
|
@ -272,7 +272,7 @@ (define* (lookup-updater package
|
|||
"Return an updater among UPDATERS that matches PACKAGE, or #f if none of
|
||||
them matches."
|
||||
(find (match-lambda
|
||||
(($ <upstream-updater> name description pred latest)
|
||||
(($ <upstream-updater> name description pred import)
|
||||
(pred package)))
|
||||
updaters))
|
||||
|
||||
|
@ -285,9 +285,9 @@ (define* (package-latest-release package
|
|||
responsibility to ensure that the returned source is newer than the current
|
||||
one."
|
||||
(any (match-lambda
|
||||
(($ <upstream-updater> name description pred latest)
|
||||
(($ <upstream-updater> name description pred import)
|
||||
(and (pred package)
|
||||
(latest package))))
|
||||
(import package))))
|
||||
updaters))
|
||||
|
||||
(define* (package-latest-release* package
|
||||
|
|
|
@ -92,7 +92,7 @@ (define (example-package old-version old-commit)
|
|||
(define* (found-sexp old-version old-commit tags releases)
|
||||
(and=>
|
||||
(call-with-releases (lambda ()
|
||||
((upstream-updater-latest %github-updater)
|
||||
((upstream-updater-import %github-updater)
|
||||
(example-package old-version old-commit)))
|
||||
tags releases)
|
||||
upstream-source->sexp))
|
||||
|
|
|
@ -488,10 +488,10 @@ (define (package-name* obj)
|
|||
(name 'dummy)
|
||||
(pred (const #t))
|
||||
(description "")
|
||||
(latest (const (upstream-source
|
||||
(package "foo")
|
||||
(version "42.0")
|
||||
(urls '("http://example.org")))))))))
|
||||
(import (const (upstream-source
|
||||
(package "foo")
|
||||
(version "42.0")
|
||||
(urls '("http://example.org")))))))))
|
||||
(let* ((p (dummy-package "foo" (version "1.0")))
|
||||
(t (options->transformation
|
||||
`((with-latest . "foo")))))
|
||||
|
|
Loading…
Reference in a new issue