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