From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kLs9K4W94GHuOQAAgWs5BA (envelope-from ) for ; Fri, 14 Jan 2022 01:02:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EGiRKIW94GG9wgAA9RJhRA (envelope-from ) for ; Fri, 14 Jan 2022 01:02:13 +0100 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 9C10C1504D for ; Fri, 14 Jan 2022 01:02:12 +0100 (CET) Received: from localhost ([::1]:60866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8A2l-0000WC-ML for larch@yhetil.org; Thu, 13 Jan 2022 19:02:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8A2e-0000Vf-36 for guix-patches@gnu.org; Thu, 13 Jan 2022 19:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41953) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8A2c-0001gl-7F for guix-patches@gnu.org; Thu, 13 Jan 2022 19:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8A2c-0001pm-3w for guix-patches@gnu.org; Thu, 13 Jan 2022 19:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53238] [PATCH] gnu: tree: Remove stddata feature. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jan 2022 00:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53238 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion Cc: 53238@debbugs.gnu.org X-Debbugs-Original-Cc: 53238@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16421184776981 (code B ref -1); Fri, 14 Jan 2022 00:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jan 2022 00:01:17 +0000 Received: from localhost ([127.0.0.1]:34856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8A1t-0001oW-22 for submit@debbugs.gnu.org; Thu, 13 Jan 2022 19:01:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:34286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8A1p-0001oN-RO for submit@debbugs.gnu.org; Thu, 13 Jan 2022 19:01:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8A1p-0000U6-4D for guix-patches@gnu.org; Thu, 13 Jan 2022 19:01:13 -0500 Received: from [2a02:c205:2020:6054::1] (port=41204 helo=tobias.gr) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8A1k-0001XB-Lz for guix-patches@gnu.org; Thu, 13 Jan 2022 19:01:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=Tke8oaw5ZXSEe WExEDHf8BXVMUFNR6uQ9xDOFfR5pIg=; h=in-reply-to:date:subject:cc:to: from:references; d=tobias.gr; b=Nl4SFPApE/WAShhIlyZlX5Ned8F9AL3yJZeqzC cpSuyz4X4pB6ClR+2mLiLXEBDWOchHjsd9G2N9ts+UaPuWvleFFqD49qyk5XQoZ9G+nBY+ 05R5gIA+xHhGSmQcU3NqEhaCyRj7eMlW+YEpPlQtihIIzImk9FuwZdG1mQuOz8uqzEz27c P5cOzYs1zrN0+QEmDGcus2DggeCmU0nwYY9UB6qebnH48bEtt5l7uFELj2PzI1s5j3C719 kNQ/rao4/1XTeAMLOE5LM/dFqbebwIwjsgjnRxT5zTJ1gOTQq6lf5vu4mQztsD8SR6Nfwl m/Fe5jeC+1T3Xiz7jJI62jPA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id e86fcdbe (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Fri, 14 Jan 2022 00:01:03 +0000 (UTC) References: <87ee5bcqhy.fsf@nckx> <87ee5bwdzw.fsf@laura> Date: Thu, 13 Jan 2022 23:33:29 +0100 In-reply-to: <87ee5bwdzw.fsf@laura> BIMI-Selector: v=BIMI1; s=default; Message-ID: <87a6fzchid.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a02:c205:2020:6054::1 (failed) Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URI_DOTEDU=0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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" Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642118532; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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: dkim-signature; bh=Tke8oaw5ZXSEeWExEDHf8BXVMUFNR6uQ9xDOFfR5pIg=; b=iyoUH2vpKfRygXaSpdhH4sWpaGbnVmcw73cDbYzvCIohFlJsJpFw18ctfz1+x+/8olcvEb lJFIvqaBFnxYPyVYIxZrFceampMo0ph8AkNzmnrtTJdvO6amvKvrv3QFoWue4h2XHv8QJ2 oF/foJcqB0kXqJBnn5+kS/Dipw/1ZWeLesLdoZXNSp5HIewmqeYazaxMp48gPApYZvuwyi ASyhzDzKVIteEUKlzWi8Gi4egRdcXxwk5gz4IKVWIa5X6ebC1FPmcWxu+N7dUkN90aFEkm XraIhyal5iRj5FsD/HJEfVLpn2u+m7yKrkDTMyHPy4cLMdz4DOJSlYAnmczvkg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642118532; a=rsa-sha256; cv=none; b=qUs7gVbxWUrpJKtMwOREBqUzZwy/VwkDg+E4HoWb7MibEDNKlR/9IAXNQmQfYDIrqLgGnb NjADUyWCpG9h3SZi7MaCveOJ1HCpBtlXg3O6vYiZ2J8Bru/c/uyDau4hGs8dB9uUncxKTd RZ1zAfDDEz/EWAe7xDg9VHFtgpu9cYCbPGV23Ej2a3LD+sP92NawA9VcuPdn9YvBqAWn6b 2qbjPApCmfvEHuGZrH12CvVfnd0VKM/oWmqawtABGuF6fa+QTr21m6hAbrPeIaKuvVZrf5 zni3r8cHnBhYZBpkSgN+VAWhZZtrWyPBx2Lrv/9esd8+8jJ9ZZSOTrW0X0799w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tobias.gr header.s=2018 header.b=Nl4SFPAp; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tobias.gr header.s=2018 header.b=Nl4SFPAp; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9C10C1504D X-Spam-Score: -5.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: XPf+dkgAQFFD --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hullo Olivier, I was going to apply the patch below to fix the password-store=20 package, but Maxime just submitted another version which I prefer.=20 I'd rather not provide two trees in Guix. Olivier Dion =E5=86=99=E9=81=93=EF=BC=9A > I've contacted the maintainer asking for removal of the feature=20 > in its > next release. After some consideration, I think it's an interesting feature.=20 Something like this is long overdue. I don't know if this approach is the right one, but I'll=20 begrudgingly settle for JSON if it finally catches on=E2=80=A6 > It's more than just packages, it's also user scripts that can be=20 > broken They can be fixed, or better yet rewritten. tree(1) is not tr(1).=20 =E2=80=98Some lazy idiot could parse this with bash=E2=80=99 !=3D =E2=80=98= frozen API which=20 upstream can never improve=E2=80=99. Really. =E2=80=A6uh, I'm describing myself there, by the way ;-) I feel quite=20 seen. Not that they needed to, but upstream even bumped the major=20 revision along with this change. > and believe me when I say that this is not an easy bug to track=20 > down ;-). Fully agree! I wasted too much time trying to track it down=20 myself. I blame password-store's spaghetto of redirection more=20 than tree. Kind regards, T G-R --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0004-gnu-password-store-Fix-failing-test-suite.patch Content-Transfer-Encoding: quoted-printable From=20e100fedb52df07738c2d535928c6c9f98042e07f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Jan 2022 13:45:25 +0000 Subject: [PATCH 04/26] gnu: password-store: Fix failing test suite. * gnu/packages/admin.scm (tree-1): New public variable. * gnu/packages/password-utils.scm (password-store)[inputs]: Use it rather than the default tree@2. Reported by Maxim Cournoyer and Olivier Dion . =2D-- gnu/packages/admin.scm | 20 ++++++++++++++++++++ gnu/packages/password-utils.scm | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f11374a439..c2e656db1a 100644 =2D-- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2421,6 +2421,26 @@ (define-public tree (home-page "http://mama.indstate.edu/users/ice/tree/") (license license:gpl2+))) =20 +(define-public tree-1 + ;; tree 2.0.0 introduced a feature called =E2=80=98stddata=E2=80=99 that= emits JSON when + ;; output is directed to file descriptor 3. At least password-store sti= ll + ;; requires the old version. + (package + (inherit tree) + (version "1.8.0") + (source (origin + (method url-fetch) + (uri (string-append + "http://mama.indstate.edu/users/ice/tree/src/tree-" + version ".tgz")) + (sha256 + (base32 "1hmpz6k0mr6salv0nprvm1g0rdjva1kx03bdf1scw8a38d5msp= bi")))) + (arguments + (substitute-keyword-arguments (package-arguments tree) + ((#:make-flags flags '()) + #~(append #$flags + (list (string-append "prefix=3D" #$output)))))))) + (define-public lr (package (name "lr") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.= scm index 0ff8608c9c..86af0deb47 100644 =2D-- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -552,7 +552,8 @@ (define-public password-store ("gnupg" ,gnupg) ("qrencode" ,qrencode) ("sed" ,sed) =2D ("tree" ,tree) + ;; XXX v1.7.4 tests are broken with tree@2: . + ("tree" ,tree-1) ("which" ,which) ("wl-clipboard" ,wl-clipboard) ("xclip" ,xclip) =2D-=20 2.34.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCYeC9Wg0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15mZIBAMSOhfVhnZcXJiiLhaKMP8ZoKDViRaFPQdR7VmZV +cgHAP9wwCSzoWCmEFZ6uTiGV9O3yAZz0IKShu35MYI1lHYqDA== =rz+G -----END PGP SIGNATURE----- --==-=-=--