From patchwork Thu Jan 13 22:33:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 36297 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 0FCC227BBEA; Fri, 14 Jan 2022 00:02:17 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 882D527BBE9 for ; Fri, 14 Jan 2022 00:02:16 +0000 (GMT) Received: from localhost ([::1]:60868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8A2p-0000WE-Lr for patchwork@mira.cbaines.net; Thu, 13 Jan 2022 19:02:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8A2e-0000Vg-3O for guix-patches@gnu.org; Thu, 13 Jan 2022 19:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41954) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8A2c-0001gm-LC 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-0001pt-JE 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 53238-submit@debbugs.gnu.org id=B53238.16421184736964 (code B ref 53238); Fri, 14 Jan 2022 00:02:02 +0000 Received: (at 53238) by debbugs.gnu.org; 14 Jan 2022 00:01:13 +0000 Received: from localhost ([127.0.0.1]:34853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8A1o-0001oF-IZ for submit@debbugs.gnu.org; Thu, 13 Jan 2022 19:01:13 -0500 Received: from tobias.gr ([80.241.217.52]:33908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8A1j-0001o0-Nn for 53238@debbugs.gnu.org; Thu, 13 Jan 2022 19:01:11 -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 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" Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: Tobias Geerinckx-Rice X-getmail-retrieved-from-mailbox: Patches Hullo Olivier, I was going to apply the patch below to fix the password-store package, but Maxime just submitted another version which I prefer. I'd rather not provide two trees in Guix. Olivier Dion 写道： > I've contacted the maintainer asking for removal of the feature > in its > next release. After some consideration, I think it's an interesting feature. Something like this is long overdue. I don't know if this approach is the right one, but I'll begrudgingly settle for JSON if it finally catches on… > It's more than just packages, it's also user scripts that can be > broken They can be fixed, or better yet rewritten. tree(1) is not tr(1). ‘Some lazy idiot could parse this with bash’ != ‘frozen API which upstream can never improve’. Really. …uh, I'm describing myself there, by the way ;-) I feel quite seen. Not that they needed to, but upstream even bumped the major revision along with this change. > and believe me when I say that this is not an easy bug to track > down ;-). Fully agree! I wasted too much time trying to track it down myself. I blame password-store's spaghetto of redirection more than tree. Kind regards, T G-R From e100fedb52df07738c2d535928c6c9f98042e07f 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 . --- 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 --- 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+))) +(define-public tree-1 + ;; tree 2.0.0 introduced a feature called ‘stddata’ that emits JSON when + ;; output is directed to file descriptor 3. At least password-store still + ;; 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 "1hmpz6k0mr6salv0nprvm1g0rdjva1kx03bdf1scw8a38d5mspbi")))) + (arguments + (substitute-keyword-arguments (package-arguments tree) + ((#:make-flags flags '()) + #~(append #$flags + (list (string-append "prefix=" #$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 --- 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) - ("tree" ,tree) + ;; XXX v1.7.4 tests are broken with tree@2: . + ("tree" ,tree-1) ("which" ,which) ("wl-clipboard" ,wl-clipboard) ("xclip" ,xclip) -- 2.34.0