[PATCH] Add tree.

[PATCH] Add tree.

[Alex Sassmannshausen]

[-- Attachment #1.1: Type: text/plain, Size: 274 bytes --]

Hello,

You should find attached a patch which adds "tree" to guix — thus
meaning I finally contribute my first package! \o/

I wasn't sure whether I should put it in another file (it's a tiny
package).

Let me know if you find anything amiss.

Cheers,
Alex


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 212 bytes --]

[-- Attachment #2: Patch to add tree. --]
[-- Type: text/x-diff, Size: 3233 bytes --]

From 133b1a62311a8a66d25375ab2e797fb5f682bc4d Mon Sep 17 00:00:00 2001
From: Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
Date: Wed, 4 Mar 2015 20:34:44 +0100
Subject: [PATCH] gnu: Add tree.

* gnu/packages/tree.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am         |  1 +
 gnu/packages/tree.scm | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 gnu/packages/tree.scm

diff --git a/gnu-system.am b/gnu-system.am
index ec3feb0..c3b3a29 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -278,6 +278,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/tmux.scm				\
   gnu/packages/tor.scm				\
   gnu/packages/tre.scm				\
+  gnu/packages/tree.scm				\
   gnu/packages/unrtf.scm			\
   gnu/packages/upnp.scm				\
   gnu/packages/uucp.scm				\
diff --git a/gnu/packages/tree.scm b/gnu/packages/tree.scm
new file mode 100644
index 0000000..77c4f00
--- /dev/null
+++ b/gnu/packages/tree.scm
@@ -0,0 +1,58 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages tree)
+  #:use-module ((guix licenses) #:select (gpl2+))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build gnu-build-system)
+  #:use-module (guix build-system gnu)
+  #:use-module (srfi srfi-1))
+
+;;; Commentary:
+;;;
+;;; A simple utility called tree.
+;;;
+;;; Code:
+
+(define-public tree
+  (package
+    (name "tree")
+    (version "1.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://mama.indstate.edu/users/ice/tree/src/tree-"
+                    version ".tgz"))
+              (sha256
+               (base32 "04kviw799qxly08zb8n5mgxfd96gyis6x69q2qiw86jnh87c4mv9"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-delete 'configure %standard-phases)
+       #:tests? #f
+       #:make-flags (let ((out (assoc-ref %outputs "out")))
+                      (list (string-append "prefix=" out)))))
+    (synopsis "Recursively list the contents of a directory")
+    (description
+     "Tree is a recursive directory listing command that produces a depth
+indented listing of files, which is colorized ala dircolors if the LS_COLORS
+environment variable is set and output is to tty.")
+    (home-page "http://mama.indstate.edu/users/ice/tree/")
+    (license gpl2+)))
+
+;;; tree.scm ends here
-- 
2.1.4

Re: [PATCH] Add tree.

[Ludovic Courtès]

Alex Sassmannshausen <alex.sassmannshausen@gmail.com> skribis:

> You should find attached a patch which adds "tree" to guix — thus
> meaning I finally contribute my first package! \o/

Yay!  :-)

> I wasn't sure whether I should put it in another file (it's a tiny
> package).

Similar tools (like ‘dfc’) ended up into admin.scm, though it’s not
perfectly right.  I think we need a module for “this kind of tool,” but
I’m not sure what to call it.  Ideas?

> From 133b1a62311a8a66d25375ab2e797fb5f682bc4d Mon Sep 17 00:00:00 2001
> From: Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
> Date: Wed, 4 Mar 2015 20:34:44 +0100
> Subject: [PATCH] gnu: Add tree.
>
> * gnu/packages/tree.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

[...]

> +;;; Commentary:
> +;;;
> +;;; A simple utility called tree.
> +;;;
> +;;; Code:

We omit the commentary for package modules.

The rest looks perfect, thank you!

Ludo’.

Re: [PATCH] Add tree.

[Alex Sassmannshausen]

[-- Attachment #1: Type: text/plain, Size: 595 bytes --]

Hello,

Ludovic Courtès writes:

>> I wasn't sure whether I should put it in another file (it's a tiny
>> package).
>
> Similar tools (like ‘dfc’) ended up into admin.scm, though it’s not
> perfectly right.  I think we need a module for “this kind of tool,” but
> I’m not sure what to call it.  Ideas?

I see. Hmm, perhaps utilities.scm? though that sounds pretty generic -
it might end up being a "misc bucket". WDYT?

I've attached an updated patch, with tree added to admin.scm for now
(and made some minor stylistic changes, added comment).

Thanks for the quick review!

Alex


[-- Attachment #2: Tree patch --]
[-- Type: text/x-diff, Size: 2158 bytes --]

From 4d7c8f1c1f92ad798cb156dfb8ad141a169abe4d Mon Sep 17 00:00:00 2001
From: Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
Date: Wed, 4 Mar 2015 20:34:44 +0100
Subject: [PATCH] gnu: Add tree.

* gnu/packages/admin.scm (tree): New variable.
---
 gnu/packages/admin.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 72d8022..c85204f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -968,6 +969,31 @@ characters can be replaced as well, as can UTF-8 characters.")
 recover lost partitions and/or make non-booting disks bootable again.")
     (license license:gpl2+)))
 
+(define-public tree
+  (package
+    (name "tree")
+    (version "1.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://mama.indstate.edu/users/ice/tree/src/tree-"
+                    version ".tgz"))
+              (sha256
+               (base32 "04kviw799qxly08zb8n5mgxfd96gyis6x69q2qiw86jnh87c4mv9"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-delete 'configure %standard-phases)
+       #:tests? #f                      ; no check target
+       #:make-flags (let ((out (assoc-ref %outputs "out")))
+                               (list (string-append "prefix=" out)))))
+    (synopsis "Recursively list the contents of a directory")
+    (description
+     "Tree is a recursive directory listing command that produces a depth
+indented listing of files, which is colorized ala dircolors if the LS_COLORS
+environment variable is set and output is to tty.")
+    (home-page "http://mama.indstate.edu/users/ice/tree/")
+    (license license:gpl2+)))
+
 (define-public direvent
   (package
     (name "direvent")
-- 
2.1.4

Re: [PATCH] Add tree.

[Ludovic Courtès]

Alex Sassmannshausen <alex.sassmannshausen@gmail.com> skribis:

> Ludovic Courtès writes:
>
>>> I wasn't sure whether I should put it in another file (it's a tiny
>>> package).
>>
>> Similar tools (like ‘dfc’) ended up into admin.scm, though it’s not
>> perfectly right.  I think we need a module for “this kind of tool,” but
>> I’m not sure what to call it.  Ideas?
>
> I see. Hmm, perhaps utilities.scm? though that sounds pretty generic -
> it might end up being a "misc bucket". WDYT?

Yeah, dunno.

> I've attached an updated patch, with tree added to admin.scm for now
> (and made some minor stylistic changes, added comment).

Committed, thanks!

Ludo’.

Re: [PATCH] Add tree.

[Alex Sassmannshausen]

Hello,

Ludovic Courtès writes:

> Similar tools (like ‘dfc’) ended up into admin.scm, though it’s not
> perfectly right.  I think we need a module for “this kind of tool,” but
> I’m not sure what to call it.  Ideas?

I've thought about this a little more, and have come up with the
following ideas (more specific):

- cli-extras
- cli-extra-utils
- cli-comfort
- cli-utils
- cli-candy (dfc, htop, tree, all kind-a more visual versions of the
  standard tools)

That's all I got :-)

Thank any of these might an improvement?

Alex

Re: [PATCH] Add tree.

[Ludovic Courtès]

Alex Sassmannshausen <alex.sassmannshausen@gmail.com> skribis:

> Ludovic Courtès writes:
>
>> Similar tools (like ‘dfc’) ended up into admin.scm, though it’s not
>> perfectly right.  I think we need a module for “this kind of tool,” but
>> I’m not sure what to call it.  Ideas?
>
> I've thought about this a little more, and have come up with the
> following ideas (more specific):
>
> - cli-extras
> - cli-extra-utils
> - cli-comfort
> - cli-utils
> - cli-candy (dfc, htop, tree, all kind-a more visual versions of the
>   standard tools)
>
> That's all I got :-)
>
> Thank any of these might an improvement?

‘cli-extras’ sounds good to me.  Other opinions?

If not, I would welcome a patch that moves things there.  :-)

Thanks,
Ludo’.