diff options
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 65c0225826..197ccef895 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2374,20 +2374,24 @@ recover lost partitions and/or make non-booting disks bootable again.") (define-public tree (package (name "tree") - (version "1.8.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (string-append "http://mama.indstate.edu/users/ice/tree/src/tree-" version ".tgz")) (sha256 - (base32 "1hmpz6k0mr6salv0nprvm1g0rdjva1kx03bdf1scw8a38d5mspbi")))) + (base32 "0f92vx6gpz7v29wi9clklzah57v7lgx5kv0m1w4b9xjc35d9qcz3")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases (delete 'configure)) - #:tests? #f ; no check target - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "prefix=" out))))) + (list + #:phases + #~(modify-phases %standard-phases + (delete 'configure)) ; No configure script. + #:tests? #f ; No check target. + #:make-flags + #~(list (string-append "PREFIX=" #$output) + (string-append "CC=" #$(cc-for-target))))) (synopsis "Recursively list the contents of a directory") (description "Tree is a recursive directory listing command that produces a depth @@ -2396,6 +2400,26 @@ 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") |