diff options
| author | Marius Bakke <marius@gnu.org> | 2022-01-16 17:38:14 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-01-17 18:23:14 +0100 |
| commit | 9070dc562ede224810db4edda354b634baa5595c (patch) | |
| tree | 20b46066050cfa38dd728aa274d21d442198dbbf | |
| parent | 5da4cbfbd94163f87f188355e5490f04dd6864c2 (diff) | |
| download | guix-patches-9070dc562ede224810db4edda354b634baa5595c.tar guix-patches-9070dc562ede224810db4edda354b634baa5595c.tar.gz | |
Revert "gnu: password-store: Fix failing test suite."
This reverts commit a40ac6271578ea061a8a07b2adbd6032a690ca70.
| -rw-r--r-- | gnu/packages/admin.scm | 20 | ||||
| -rw-r--r-- | gnu/packages/password-utils.scm | 3 |
2 files changed, 1 insertions, 22 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 197ccef895..bdc52101db 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2400,26 +2400,6 @@ environment variable is set and output is to tty.") (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 de7302618e..440bb927a6 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -554,8 +554,7 @@ any X11 window.") gnupg qrencode sed - ;; XXX v1.7.4 tests are broken with tree@2: <issues.guix.gnu.org/53238>. - tree-1 + tree which wl-clipboard xclip |