From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KMnjG+AyTWBnAQAA0tVLHw (envelope-from ) for ; Sat, 13 Mar 2021 21:47:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YL6hF+AyTWDmcQAAB5/wlQ (envelope-from ) for ; Sat, 13 Mar 2021 21:47:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 238308C7D for ; Sat, 13 Mar 2021 22:47:12 +0100 (CET) Received: from localhost ([::1]:46126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC6J-00056N-8F for larch@yhetil.org; Sat, 13 Mar 2021 16:47:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLC6A-000554-O4 for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49300) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLC6A-000348-GX for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lLC6A-0000m2-Ep for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47126] [PATCH 1/7] gnu-maintenance: Use (htmlprag) for 'latest-html-release'. References: <20210313214326.28052-1-ludo@gnu.org> In-Reply-To: <20210313214326.28052-1-ludo@gnu.org> Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Mar 2021 21:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47126@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 47126-submit@debbugs.gnu.org id=B47126.16156719942862 (code B ref 47126); Sat, 13 Mar 2021 21:47:02 +0000 Received: (at 47126) by debbugs.gnu.org; 13 Mar 2021 21:46:34 +0000 Received: from localhost ([127.0.0.1]:60829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLC5h-0000k0-9U for submit@debbugs.gnu.org; Sat, 13 Mar 2021 16:46:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLC5g-0000jh-6l for 47126@debbugs.gnu.org; Sat, 13 Mar 2021 16:46:32 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42777) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC5a-0002qP-GG; Sat, 13 Mar 2021 16:46:26 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39284 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lLC5a-0004wi-2U; Sat, 13 Mar 2021 16:46:26 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sat, 13 Mar 2021 22:46:14 +0100 Message-Id: <20210313214620.28186-1-ludo@gnu.org> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615672032; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=zEIyu+SAAVUHyA2Z2+/1/xIh/OCpqjkEe7sw99qxmdk=; b=qSYmoEKYPFYyNvcHDsVWPwq3SWkQoZCqQ/xHf2tZOqI3VuRH0ABu237GELb7UPl0RAXf3i vBqYkYdZX/sBqyoR1vKCsRsgZ5epiPuN2mVQ3xuFikZfvvtgv/wwKKdqBqsyeRkP59D/HT A2HEs6hz5LOyV3zC5wa1OEONa2EN7HvatNITqQWFK65+xxVmvnIioCVkya6SinbIbCUQQu /8UhDxU9dQRQayZ+flRFjnydZdpkidob66QbXfG7Mwm+anYfVg+F03XUmZdSoaQXs5qPRt oYtRfVp669VVz7lt1NeobfTbdfR8Lu/LDD2bqlhuopvobgEtI/DoRUPNCCIvVg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615672032; a=rsa-sha256; cv=none; b=qKwfZdajHes5W2jir6ZIFR4lvKGF+3lBvPdUjIaT2Z9EpU+qIdIHmreuBflylIVawbBQSR yjQTuU5C+HAhmhJ43XAch/oLEfKwDh5dTTD7NpHykYmW0QZvBcN6AZ7BNBn27mSAyKiemn 8N45PHArkruBCrKQ1aEPj1hwLhtlYxQtfEREZqe7aT21sOXwDJa+NxGX5LSclJ2lB1LPWb 9CzJrOVH3x6/Kv9johTmnUqhSBhz+Q5cvbqLiuoWB3D5SQ0EPy74x2E2Cmh7tyQ66KKYnU 1dgj9w5av9VvTIIskaycFkoHAzdr3UY8EgGBpTNwLRbNn+Af+T3nLUz8jhtszg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.10 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 238308C7D X-Spam-Score: 2.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: iyDmz6xl511y * 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 but if - ;; needed we could resort to (htmlprag) from Guile-Lib. - (call-with-input-string (string-replace-substring str "
" "
") - 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