From patchwork Fri Feb 3 15:21:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 46654 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CA71627BBE9; Fri, 3 Feb 2023 15:22:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 38F4327BBEB for ; Fri, 3 Feb 2023 15:22:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNxt9-00075a-9L; Fri, 03 Feb 2023 10:22:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNxt5-00074I-0T for guix-patches@gnu.org; Fri, 03 Feb 2023 10:22:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNxt4-0004dJ-GH for guix-patches@gnu.org; Fri, 03 Feb 2023 10:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNxt3-00030R-Ri for guix-patches@gnu.org; Fri, 03 Feb 2023 10:22:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61226] [PATCH v2 1/2] gnu: Add a pinned-version variant of w3m. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 15:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61226 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 61226@debbugs.gnu.org Received: via spool by 61226-submit@debbugs.gnu.org id=B61226.167543769511515 (code B ref 61226); Fri, 03 Feb 2023 15:22:01 +0000 Received: (at 61226) by debbugs.gnu.org; 3 Feb 2023 15:21:35 +0000 Received: from localhost ([127.0.0.1]:39772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNxsd-0002zd-BT for submit@debbugs.gnu.org; Fri, 03 Feb 2023 10:21:35 -0500 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]:42247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNxsZ-0002zG-Uj for 61226@debbugs.gnu.org; Fri, 03 Feb 2023 10:21:33 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id D35D02B06727; Fri, 3 Feb 2023 10:21:24 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 03 Feb 2023 10:21:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=mesmtp; t=1675437684; x=1675444884; bh=BQqVW6b P+oKEHUHTQ0FuuJX1i+GW+HaGEniJ9IgNrNE=; b=WDL1dS866VwrfwFQ0z2++Ey Y3+N2STuOmdS0XZHTJHjNtcFwNgQKp7BPREp6yk6uH7D6AB7ggcXvCmly6XZKG8b kHiCClgsE4UyFTTNVaNyhDylHWA7/XUL/1S8DeaPReW6Vld0/u0OffnrKhSZk+4U dpUAKNFCR0h3Z+uS2mIE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1675437684; x=1675444884; bh=BQqVW6bP+oKEHUHTQ0FuuJX1i+GW +HaGEniJ9IgNrNE=; b=GZFRSAwMGbr/8H/EKz5O/9LtyN4EnU0ffsqC84vP29aO G+yseWxUxNgn9vRZh65S9w1EIE+A+ZxSYkZNbb4TTJIv0JURSFytflSeQXt5ZMip cs9vtzWJTlGjWg8Fljf6UeQKi9VsKyPXDfKlK4P/kNJf7pApXNXw095PaB0mi5RH 2AiNIgMlDxy/uwtYSEZkaOnujYiR5WJEOBcl4SW6MQ7S8QYVCjV/KWwv4ucH5uZJ Zfne5LoFlCsUZPaY05EmajFYe7/CwiRzpDY61WXPr91DCoTjiwATWDup7+bfc6Bc ODqe+C0B2nMBhQQLnuLX9e6kSjDn6zdSenH02fWx6g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudegtddgjeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeehgeelffffgfeghefgieeuhfduhffgfe egteehleetvdeivdeutefhfeejfeekheenucffohhmrghinhepuggvsghirghnrdhorhhg necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <61226@debbugs.gnu.org>; Fri, 3 Feb 2023 10:21:23 -0500 (EST) From: Leo Famulari Date: Fri, 3 Feb 2023 16:21:16 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/w3m.scm (w3m-for-tests): New variable. --- gnu/packages/w3m.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 3efacf7346..73e6417cf2 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2016, 2017, 2018 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2023 Leo Famulari ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2018 Rutger Helling @@ -86,3 +86,21 @@ (define-public w3m typesets HTML into plain text.") (license (x11-style "file://doc/README" "See 'doc/README' in the distribution.")))) + +;; Used in the test suite of xdg-utils +(define-public w3m-for-tests + (hidden-package + (package + (inherit w3m) + (name "w3m") + (version "0.5.3+git20230121") + (source (origin + (method git-fetch) + ;; Debian's fork of w3m is the only one that is still maintained. + (uri (git-reference + (url "https://salsa.debian.org/debian/w3m.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nvhxsqxgxjrr62mvxzhhfzvbvg56g19vlqcgb8mh2x1daazk5ms"))))))) From patchwork Fri Feb 3 15:21:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 46655 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8080627BBEB; Fri, 3 Feb 2023 15:22:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F30C527BBE9 for ; Fri, 3 Feb 2023 15:22:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNxt7-00075H-W8; Fri, 03 Feb 2023 10:22:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNxt5-00074H-0W for guix-patches@gnu.org; Fri, 03 Feb 2023 10:22:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNxt4-0004dK-E8 for guix-patches@gnu.org; Fri, 03 Feb 2023 10:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNxt4-00030Y-9l for guix-patches@gnu.org; Fri, 03 Feb 2023 10:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61226] [PATCH v2 2/2] gnu: xdg-utils: Use a pinned version of w3m. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 15:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61226 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 61226@debbugs.gnu.org Received: via spool by 61226-submit@debbugs.gnu.org id=B61226.167543769611521 (code B ref 61226); Fri, 03 Feb 2023 15:22:02 +0000 Received: (at 61226) by debbugs.gnu.org; 3 Feb 2023 15:21:36 +0000 Received: from localhost ([127.0.0.1]:39774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNxsd-0002zf-Nw for submit@debbugs.gnu.org; Fri, 03 Feb 2023 10:21:36 -0500 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]:38403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNxsa-0002zJ-J2 for 61226@debbugs.gnu.org; Fri, 03 Feb 2023 10:21:33 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 0854F2B0672B; Fri, 3 Feb 2023 10:21:26 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 03 Feb 2023 10:21:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=mesmtp; t=1675437686; x=1675444886; bh=Du985lGAVLjhrQg2hEJUDpSnc8UcDvd/LhknyqHucgY=; b=SRcY3r1RGjLB Ss7yVEl3uMvd8Z/8B5aWkzcWyzNA6R1anDQ/Dh3QQ0QA0LcR6r/fBSUcbT+nTjw8 gGeE8Mk9uLV39HCTDJZ7IrgUEU3YNK35IqEgPKgb5VDryzzBSwEj/RiVhPyfRlAC /678cptmI68KdHe9rrA71AJilixKE2w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1675437686; x=1675444886; bh=Du985lGAVLjhr Qg2hEJUDpSnc8UcDvd/LhknyqHucgY=; b=FZmwO2LV+kIWKR1+nvy66IuWrxwCe I433uZ+OwU9+ErjVTBwfhOMrR9NVCKj6EeJerTTzd9dReY2EvJP8pqm+QrVh1nnT FTi3r1cww1HtMcqPvVe5GoV7XeXob15owh3rLv01ub+Yo9g7AO62ieZeIpwYdmo1 JCk4sCuqhuL4zw+vDPk6D1+tr6tuh2GzjMkMxOK4i70r/5Vg2Ek9v5tcSj1J/MnA 9ittua9dFNYMch/EREKcVT2WujzWebHC9OJ3RyddR2XIhkVmtvxPfZby+dYkAaQr e8AjAXbKUfp0GLczLkzYIZ7QyfXBN1+Yv+sd7JGS8+gduqDdh6M4FZ52g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudegtddgjeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephfeggeetiedtvdduudevueehvdehhf efhefghedvhfdugeeukeehvdfhfffhhfegnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <61226@debbugs.gnu.org>; Fri, 3 Feb 2023 10:21:25 -0500 (EST) From: Leo Famulari Date: Fri, 3 Feb 2023 16:21:17 +0100 Message-Id: <935e58c604d205cf0178cefb04e5508b8530422c.1675437676.git.leo@famulari.name> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (xdg-utils)[native-inputs]: Replace w3m with w3m-for-tests. [arguments]: Use #:disallowed-references to prevent keeping a reference to w3m-for-tests. --- gnu/packages/freedesktop.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a986c8c350..677ab5fdf2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -482,7 +482,7 @@ (define-public xdg-utils "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) (build-system gnu-build-system) (native-inputs - (list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto)) + (list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto)) (inputs `(("awk" ,gawk) ;; TODO(staging): Make this unconditional, to avoid canonical packages, @@ -501,7 +501,9 @@ (define-public xdg-utils ("xprop" ,xprop) ; for Xfce detecting ("xset" ,xset))) ; for xdg-screensaver (arguments - `(#:tests? #f ; no check target + `(; Ensure we don't keep a reference to this old version of w3m + #:disallowed-references (,w3m-for-tests) + #:tests? #f ; no check target #:modules ((srfi srfi-26) ,@%gnu-build-system-modules) #:phases