From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +EooMBXzn2BBcQAAgWs5BA (envelope-from ) for ; Sat, 15 May 2021 18:13:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id eA2uKxXzn2BuLwAAbx9fmQ (envelope-from ) for ; Sat, 15 May 2021 16:13:09 +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 6DE348AD4 for ; Sat, 15 May 2021 18:13:09 +0200 (CEST) Received: from localhost ([::1]:36382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhwua-0002Za-I0 for larch@yhetil.org; Sat, 15 May 2021 12:13:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhwuU-0002Yt-NW for guix-patches@gnu.org; Sat, 15 May 2021 12:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lhwuU-0000xE-ED for guix-patches@gnu.org; Sat, 15 May 2021 12:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lhwuU-0004eM-9b for guix-patches@gnu.org; Sat, 15 May 2021 12:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47898] [PATCH] [core-updates] Add option --xpath0 to xmllint from libxml2 Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 May 2021 16:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: david larsson , 47898@debbugs.gnu.org Received: via spool by 47898-submit@debbugs.gnu.org id=B47898.162109515217838 (code B ref 47898); Sat, 15 May 2021 16:13:02 +0000 Received: (at 47898) by debbugs.gnu.org; 15 May 2021 16:12:32 +0000 Received: from localhost ([127.0.0.1]:49115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhwu0-0004de-1F for submit@debbugs.gnu.org; Sat, 15 May 2021 12:12:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhwty-0004dR-F8 for 47898@debbugs.gnu.org; Sat, 15 May 2021 12:12:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47924) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhwtq-0000kd-19; Sat, 15 May 2021 12:12:22 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:37594 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhwtp-0006Wg-Ni; Sat, 15 May 2021 12:12:21 -0400 From: Marius Bakke In-Reply-To: References: <20aec8da67d18b52e5a166f45cab40b2@selfhosted.xyz> <87eeeaiz5h.fsf@gnu.org> <48c1517d3239d55826324aa8f2bc9d4d@selfhosted.xyz> <87bl9eiwx5.fsf@gnu.org> <80bc8f6c73d5aa423cf906d59bbcd43e@selfhosted.xyz> Date: Sat, 15 May 2021 18:12:19 +0200 Message-ID: <875yzkht7g.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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=1621095189; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=vPkT7W2SnpTBMBqLYXyU9BvhxdDyTXStMoUxb8Y1USQ=; b=FlJiogj9QDbXwQo+03Nm0rlGP8XuyvOudadDctvMQUh4PKBmbzyMX0un3apU4Lc4xOycKf uiUgxPqt0a+MiQlRu4vhLxu42/XtTqcXnfCUWXgr350YDRam9vonKByvKG40YWQjnxTYVD EjnD7MhHGGqwr8ZuwFYeJemW6rA4MeOYRD0dxgI0FI/yQ+3dGxHkBJjHisd3xPQUknEm4a wQJ8xkS0nclbBtrft5IkJ9M/f5xzifqZj9DGLkWOGeLR73K7yvzM+gEmkvXpPktHra1HRx +tIJ2VYqEOsyHEazwSY61/DAmJNQYBOJItgJ7kTklXFpW75SoggyYAyC5UFdIw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621095189; a=rsa-sha256; cv=none; b=Q8u+zSbEJpfPGhjTNMTbXl4nU6vrEa3WD/FF/6wmoveLUPUFDx4ZiqGr30wMMmqs2l4t5T AV+1IJR0ncBe4xkNWFfvVgpRk7VX5HJY2xw+UjSjIwISV7KIasQhNIrUT1jux1vpel3Cgv 2DrP/Y5mZMzLWr+AGcsQxVnrcQV1bewD5TxUnp62NKwqe9wzftvuwjfOzLbyBF0WoZ7jOX 1HnI72hq66jZ69uYSCVN8sjmjuRxdBx6MtL8+rN69vtjMDoQnGeg4znqZJcOQEkN+tTkdK XJrSE6URIc0FRPfE/BjFQ0dtTeVJRXZpTTZkN6rZdr+xWwucnAQoDyqdiDPkNw== 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.55 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: 6DE348AD4 X-Spam-Score: -2.55 X-Migadu-Scanner: scn0.migadu.com X-TUID: L9WVPk61C3m/ --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable david larsson skriver: >> libxml2-xpath0 is probably better indeed, I don't have a strong=20 >> opinion. >> Can you send an updated patch? :-) >>=20 >> Thanks, >> Marius > > Updated patch attached! Thanks! [...] > gnu/packages/patches/libxml2-Add-option-xpath0.patch: New file... > gnu/packages/xml.scm (libxml2-xpath0) [source]: ...apply it. > --- > .../patches/libxml2-Add-option-xpath0.patch | 139 ++++++++++++++++++ > gnu/packages/xml.scm | 52 +++++++ > 2 files changed, 191 insertions(+) > create mode 100644 gnu/packages/patches/libxml2-Add-option-xpath0.patch Please also register this patch in gnu/local.mk. Can you also add your copyright at the top of xml.scm? [...] > +(define-public libxml2-xpath0 > + (package > + (name "libxml2-xpath0") > + (version "2.9.10") > + (source (origin > + (method url-fetch) > + (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" > + version ".tar.gz")) > + (sha256 > + (base32 > + "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma")) > + (patches (list (search-patch "libxml2-Add-option-xpath0.pat= ch"))))) You can inherit another record in Scheme to avoid duplicating all the fields. Then the package can be shortened to: (define-public libxml2-xpath0 (package/inherit libxml2 (name "libxml2-xpath0") (source (origin (inherit (package-source libxml2)) (patches (append (search-patches "libxml2-Add-option-xpath0= .patch") (origin-patches (package-source libxml2)))= ))) (description "..."))) We should fill out that description to mention how it differs from the regular libxml2. Can you give it a try? I can make the other changes on your behalf, but not sure what to write. Thanks, Marius --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYJ/y4w8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHeAcAEA9arySw4EJ9t8tNYXWlwJFLwk/8YVzaVECJ00 PPTQwysA/iSv/GRtJeicerQ9AUh+uiSP1uWs8FH52NkrgwPZHe8H =ycNQ -----END PGP SIGNATURE----- --=-=-=--