[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47126] [PATCH 1/7] gnu-maintenance: Use (htmlprag) for 'latest-html
From: |
Ludovic Courtès |
Subject: |
[bug#47126] [PATCH 1/7] gnu-maintenance: Use (htmlprag) for 'latest-html-release'. |
Date: |
Sat, 13 Mar 2021 22:46:14 +0100 |
* guix/gnu-maintenance.scm (html->sxml): Remove. Autoload (htmlprag)
instead.
* doc/guix.texi (Requirements): Mention 'guix refresh' for the Guile-Lib
dependency.
---
doc/guix.texi | 3 ++-
guix/gnu-maintenance.scm | 13 +------------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 4cf241c56a..97094a7d0a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -865,7 +865,8 @@ the @code{crate} importer (@pxref{Invoking guix import}).
@item
@uref{https://www.nongnu.org/guile-lib/doc/ref/htmlprag/, Guile-Lib} for
-the @code{go} importer (@pxref{Invoking guix import}).
+the @code{go} importer (@pxref{Invoking guix import}) and for some of
+the ``updaters'' (@pxref{Invoking guix refresh}).
@item
When @url{http://www.bzip.org, libbz2} is available,
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 9e393d18cd..febed57c3a 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -38,6 +38,7 @@
#:use-module (guix upstream)
#:use-module (guix packages)
#:autoload (zlib) (call-with-gzip-input-port)
+ #:autoload (htmlprag) (html->sxml) ;from Guile-Lib
#:export (gnu-package-name
gnu-package-mundane-name
gnu-package-copyright-holder
@@ -447,18 +448,6 @@ hosted on ftp.gnu.org, or not under that name (this is the
case for
;;; Latest HTTP release.
;;;
-(define (html->sxml port)
- "Read HTML from PORT and return the corresponding SXML tree."
- (let ((str (get-string-all port)))
- (catch #t
- (lambda ()
- ;; XXX: This is the poor developer's HTML-to-XML converter. It's good
- ;; enough for directory listings at <https://kernel.org/pub> but if
- ;; needed we could resort to (htmlprag) from Guile-Lib.
- (call-with-input-string (string-replace-substring str "<hr>" "<hr />")
- xml->sxml))
- (const '(html))))) ;parse error
-
(define (html-links sxml)
"Return the list of links found in SXML, the SXML tree of an HTML page."
(let loop ((sxml sxml)
--
2.30.1
- [bug#47126] [PATCH 0/7] Add 'generic-html' updater, Ludovic Courtès, 2021/03/13
- [bug#47126] [PATCH 1/7] gnu-maintenance: Use (htmlprag) for 'latest-html-release'.,
Ludovic Courtès <=
- [bug#47126] [PATCH 2/7] gnu-maintenance: 'latest-html-release' considers non-relative URLs., Ludovic Courtès, 2021/03/13
- [bug#47126] [PATCH 3/7] gnu-maintenance: 'release-file?' rejects checksum files., Ludovic Courtès, 2021/03/13
- [bug#47126] [PATCH 4/7] gnu-maintenance: 'latest-html-release' can determine signature file name., Ludovic Courtès, 2021/03/13
- [bug#47126] [PATCH 5/7] gnu-maintenance: 'latest-html-release' better computes version number., Ludovic Courtès, 2021/03/13
- [bug#47126] [PATCH 6/7] gnu-maintenance: Add 'generic-html' updater., Ludovic Courtès, 2021/03/13
- [bug#47126] [PATCH 7/7] gnu: hwloc: Add 'release-monitoring-url' property., Ludovic Courtès, 2021/03/13
- [bug#47126] [PATCH 0/7] Add 'generic-html' updater, Léo Le Bouter, 2021/03/17