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 <maxim.cournoyer@gmail.com> and
Olivier Dion <olivier.dion@polymtl.ca>.
This commit is contained in:
Tobias Geerinckx-Rice 2022-01-13 13:45:25 +00:00
parent 1e20aec1f8
commit a40ac62715
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 22 additions and 1 deletions

View file

@ -2422,6 +2422,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")

View file

@ -553,7 +553,8 @@ (define-public password-store
gnupg
qrencode
sed
tree
;; XXX v1.7.4 tests are broken with tree@2: <issues.guix.gnu.org/53238>.
tree-1
which
wl-clipboard
xclip