[PATCH 0/2] Add tools for sysadmins: htop and dfc.

[PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Cyril Roelandt]

Hey!

This patch series adds htop and dfc, which are 'modern' versions of top and df.
Note that dfc is the first Guix package to use the CMake build system!

Cyril.
---
Cyril Roelandt (2):
  gnu: Add htop.
  gnu: Add dfc.

 gnu-system.am             |    1 +
 gnu/packages/sysutils.scm |   70 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 gnu/packages/sysutils.scm

-- 
1.7.10.4

[PATCH 1/2] gnu: Add htop.

[Cyril Roelandt]

* gnu/packages/sysutils.scm: New file.
* gnu-system.am: Add it.
---
 gnu-system.am             |    1 +
 gnu/packages/sysutils.scm |   47 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 gnu/packages/sysutils.scm

diff --git a/gnu-system.am b/gnu-system.am
index 2600858..fc1872e 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -155,6 +155,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/sqlite.scm			\
   gnu/packages/ssh.scm				\
   gnu/packages/system.scm			\
+  gnu/packages/sysutils.scm 			\
   gnu/packages/tcl.scm				\
   gnu/packages/tcsh.scm				\
   gnu/packages/texinfo.scm			\
diff --git a/gnu/packages/sysutils.scm b/gnu/packages/sysutils.scm
new file mode 100644
index 0000000..c79ac90
--- /dev/null
+++ b/gnu/packages/sysutils.scm
@@ -0,0 +1,47 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@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 sysutils)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages ncurses))
+
+(define-public htop
+  (package
+   (name "htop")
+   (version "1.0.2")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "mirror://sourceforge/htop/"
+                  version "/htop-" version ".tar.gz"))
+            (sha256
+             (base32
+              "18fqrhvnm7h4c3939av8lpiwrwxbyw6hcly0jvq0vkjf0ixnaq7f"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("ncurses" ,ncurses)))
+   (home-page "http://htop.sourceforge.net/")
+   (synopsis "An interactive process viewer for Linux")
+   (description
+    "This is htop, an interactive process viewer for Linux.  It is a text-mode
+application (for console or X terminals) and requires ncurses.")
+   (license gpl2)))
-- 
1.7.10.4

[PATCH 2/2] gnu: Add dfc.

[Cyril Roelandt]

* gnu/packages/sysutils.scm (dfc): New variable.
---
 gnu/packages/sysutils.scm |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/sysutils.scm b/gnu/packages/sysutils.scm
index c79ac90..953d723 100644
--- a/gnu/packages/sysutils.scm
+++ b/gnu/packages/sysutils.scm
@@ -20,10 +20,33 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages ncurses))
 
+(define-public dfc
+  (package
+   (name "dfc")
+   (version "3.0.3")
+   (source
+    (origin
+     (method url-fetch)
+      (uri (string-append
+            "http://projects.gw-computing.net/attachments/download/78/dfc-"
+            version ".tar.gz"))
+      (sha256
+       (base32
+        "1b4hfqv23l87cb37fxwzfk2sgspkyxpr3ig2hsd23hr6mm982j7z"))))
+   (build-system cmake-build-system)
+   (arguments '(#:tests? #f))
+   (home-page "http://projects.gw-computing.net/projects/dfc")
+   (synopsis "Display file system space usage using graphs and colors.")
+   (description
+    "dfc (df color) is a modern version of df.  It uses colors, draws pretty
+graphs and can export its output to different formats.")
+   (license bsd-3)))
+
 (define-public htop
   (package
    (name "htop")
-- 
1.7.10.4

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Cyril Roelandt]

On 08/30/2013 10:58 PM, Nikita Karetnikov wrote:
> More nitpicking…
>
>> +            (uri (string-append
>> +                  "mirror://sourceforge/htop/"
>> +                  version "/htop-" version ".tar.gz"))
>
> Could you place ‘string-append’ and "mirror://sourceforge/htop/" on
> the same line?
>

Yes. I never know what to do in such cases. Is there a document that 
contains these coding-style rules, such as the PEP8 for Python ?

>> +   (arguments '(#:tests? #f))
>
> Why did you disable tests?  Could you add a comment about that?
>

Sure. There are no tests :)

Cyril.

Re: [PATCH 1/2] gnu: Add htop.

[Cyril Roelandt]

On 08/30/2013 10:50 PM, Nikita Karetnikov wrote:
>> +   (synopsis "An interactive process viewer for Linux")
>> +   (description
>> +    "This is htop, an interactive process viewer for Linux.  It is a text-mode
>> +application (for console or X terminals) and requires ncurses.")
>
> I’d suggest to change “Linux” to “the Linux kernel” or “GNU/Linux” to
> avoid ambiguity.  It might be even better not to use this word at all.
>

It seems to be also available in the FreeBSD ports, and in NetBSD 
through pkgsrc. I'll s/ for Linux//.

Cyril.

Re: [PATCH 1/2] gnu: Add htop.

[Nikita Karetnikov]

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

> +   (synopsis "An interactive process viewer for Linux")
> +   (description
> +    "This is htop, an interactive process viewer for Linux.  It is a text-mode
> +application (for console or X terminals) and requires ncurses.")

I’d suggest to change “Linux” to “the Linux kernel” or “GNU/Linux” to
avoid ambiguity.  It might be even better not to use this word at all.

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Nikita Karetnikov]

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

More nitpicking…

> +            (uri (string-append
> +                  "mirror://sourceforge/htop/"
> +                  version "/htop-" version ".tar.gz"))

Could you place ‘string-append’ and "mirror://sourceforge/htop/" on
the same line?

> +   (arguments '(#:tests? #f))

Why did you disable tests?  Could you add a comment about that?

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

[PATCH 1/2 v2] gnu: Add htop.

[Cyril Roelandt]

* gnu/packages/sysutils.scm: New file.
* gnu-system.am: Add it.
---
 gnu-system.am             |    1 +
 gnu/packages/sysutils.scm |   46 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 gnu/packages/sysutils.scm

diff --git a/gnu-system.am b/gnu-system.am
index 2600858..fc1872e 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -155,6 +155,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/sqlite.scm			\
   gnu/packages/ssh.scm				\
   gnu/packages/system.scm			\
+  gnu/packages/sysutils.scm 			\
   gnu/packages/tcl.scm				\
   gnu/packages/tcsh.scm				\
   gnu/packages/texinfo.scm			\
diff --git a/gnu/packages/sysutils.scm b/gnu/packages/sysutils.scm
new file mode 100644
index 0000000..e7ee51f
--- /dev/null
+++ b/gnu/packages/sysutils.scm
@@ -0,0 +1,46 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@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 sysutils)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages ncurses))
+
+(define-public htop
+  (package
+   (name "htop")
+   (version "1.0.2")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://sourceforge/htop/"
+                  version "/htop-" version ".tar.gz"))
+            (sha256
+             (base32
+              "18fqrhvnm7h4c3939av8lpiwrwxbyw6hcly0jvq0vkjf0ixnaq7f"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("ncurses" ,ncurses)))
+   (home-page "http://htop.sourceforge.net/")
+   (synopsis "An interactive process viewer")
+   (description
+    "This is htop, an interactive process viewer.  It is a text-mode
+application (for console or X terminals) and requires ncurses.")
+   (license gpl2)))
-- 
1.7.10.4

[PATCH 2/2 v2] gnu: Add dfc.

[Cyril Roelandt]

* gnu/packages/sysutils.scm (dfc): New variable.
---
 gnu/packages/sysutils.scm |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/sysutils.scm b/gnu/packages/sysutils.scm
index e7ee51f..d91719c 100644
--- a/gnu/packages/sysutils.scm
+++ b/gnu/packages/sysutils.scm
@@ -20,10 +20,33 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages ncurses))
 
+(define-public dfc
+  (package
+   (name "dfc")
+   (version "3.0.3")
+   (source
+    (origin
+     (method url-fetch)
+      (uri (string-append
+            "http://projects.gw-computing.net/attachments/download/78/dfc-"
+            version ".tar.gz"))
+      (sha256
+       (base32
+        "1b4hfqv23l87cb37fxwzfk2sgspkyxpr3ig2hsd23hr6mm982j7z"))))
+   (build-system cmake-build-system)
+   (arguments '(#:tests? #f)) ; There are no tests.
+   (home-page "http://projects.gw-computing.net/projects/dfc")
+   (synopsis "Display file system space usage using graphs and colors.")
+   (description
+    "dfc (df color) is a modern version of df.  It uses colors, draws pretty
+graphs and can export its output to different formats.")
+   (license bsd-3)))
+
 (define-public htop
   (package
    (name "htop")
-- 
1.7.10.4

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Cyril Roelandt]

On 08/30/2013 11:30 PM, Andreas Enge wrote:
> On Fri, Aug 30, 2013 at 10:08:34PM +0200, Cyril Roelandt wrote:
>> This patch series adds htop and dfc, which are 'modern' versions of top and df.
>> Note that dfc is the first Guix package to use the CMake build system!
>
> Since cmake currently does not pass its tests on x86_64, I suppose the
> package will so far be only available on i686?
>

Yes. I'll have to look into this cmake issue. I think I'll start by 
upgrading to 2.8.11.2, see if it fixes the issue.

Cyril.

Re: [PATCH 1/2] gnu: Add htop.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> On 08/30/2013 10:50 PM, Nikita Karetnikov wrote:
>>> +   (synopsis "An interactive process viewer for Linux")
>>> +   (description
>>> +    "This is htop, an interactive process viewer for Linux.  It is a text-mode
>>> +application (for console or X terminals) and requires ncurses.")
>>
>> I’d suggest to change “Linux” to “the Linux kernel” or “GNU/Linux” to
>> avoid ambiguity.  It might be even better not to use this word at all.
>>
>
> It seems to be also available in the FreeBSD ports, and in NetBSD
> through pkgsrc. I'll s/ for Linux//.

Agreed, just remove “for Linux”.

Also, remove “An” from the synopsis.

Then OK to push.

Thanks!

Ludo’.

Re: [PATCH 2/2] gnu: Add dfc.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> +   (build-system cmake-build-system)

Woow.  :-)

> +   (arguments '(#:tests? #f))

Please add a comment saying why tests are disabled.

> +   (home-page "http://projects.gw-computing.net/projects/dfc")
> +   (synopsis "Display file system space usage using graphs and colors.")

No period at the end of the synopsis.

OK to push with these changes!

Ludo’.

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Andreas Enge]

On Fri, Aug 30, 2013 at 10:08:34PM +0200, Cyril Roelandt wrote:
> This patch series adds htop and dfc, which are 'modern' versions of top and df.
> Note that dfc is the first Guix package to use the CMake build system!

Since cmake currently does not pass its tests on x86_64, I suppose the
package will so far be only available on i686?

Andreas

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> On 08/30/2013 10:58 PM, Nikita Karetnikov wrote:
>> More nitpicking…
>>
>>> +            (uri (string-append
>>> +                  "mirror://sourceforge/htop/"
>>> +                  version "/htop-" version ".tar.gz"))
>>
>> Could you place ‘string-append’ and "mirror://sourceforge/htop/" on
>> the same line?
>>
>
> Yes. I never know what to do in such cases. Is there a document that
> contains these coding-style rules, such as the PEP8 for Python ?

Mainly this: http://mumble.net/~campbell/scheme/style.txt .
And the knowledge that’s in Emacs’s Scheme mode.

Ludo’.

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Nikita Karetnikov]

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

> Yes. I never know what to do in such cases. Is there a document that
> contains these coding-style rules, such as the PEP8 for Python ?

The pretty-printing rule is described in SICP.  Search for “There is no
limit” [1].  However, that paragraph doesn’t say what to do when the
line is too long.

I’m trying to keep lines under 79 characters (as suggested in PEP8).  It
allows “to have several files open side-by-side, and works well when
using code review tools that present the two versions in adjacent
columns” [2].  I also find that short lines are easier to read.

I believe it’s OK to write

(proc very-very-very-very-very-very-long-argument
      a b c)

instead of

(proc very-very-very-very-very-very-long-argument
      a
      b
      c)

because this allows to display more lines on the screen.

Also, it may be a good idea to write

(very-long-procedure1
 argument1
 (very-long-procedure2
  argument2
  (very-long-procedure3
   argument3
   (...))))

instead of

(very-long-procedure1 argument1
                      (very-long-procedure2 argument2
                                            (very-long-procedure3 argument3
                                                                  (...))))

That said, you have to break the rules sometimes.

Should we mention this in the “packaging rules” section?

[1] https://mitpress.mit.edu/sicp/full-text/book/book-Z-H-10.html#%_sec_1.1.1
[2] http://www.python.org/dev/peps/pep-0008/#maximum-line-length

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH 1/2 v2] gnu: Add htop.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> +   (synopsis "An interactive process viewer")

-An, but OK otherwise.

Ludo’.

Re: [PATCH 2/2 v2] gnu: Add dfc.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> +   (synopsis "Display file system space usage using graphs and colors.")

Minus period, but OK otherwise.

Ludo’.

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Ludovic Courtès]

Nikita Karetnikov <nikita@karetnikov.org> skribis:

> Should we mention this in the “packaging rules” section?

I think our messages crossed.  What do you think of the “Coding Style”
section in ‘HACKING’?

Ludo’.

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> This patch series adds htop and dfc, which are 'modern' versions of top and df.

[...]

>  gnu/packages/sysutils.scm |   70 +++++++++++++++++++++++++++++++++++++++++++++

It just occurred to me that there’s already (gnu packages system), which
contains sysadmin tools.

Could you put the contents of sysutils.scm in there?

Thanks,
Ludo’.

Re: [PATCH 0/2] Add tools for sysadmins: htop and dfc.

[Nikita Karetnikov]

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

> I think our messages crossed.  What do you think of the “Coding Style”
> section in ‘HACKING’?

It’s OK.  Let’s keep it.

We could always augment it if there’s a need.

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

[PATCH 1/2 v3] gnu: Add htop.

[Cyril Roelandt]

* gnu/packages/sysutils.scm (htop): New variable.
---
 gnu/packages/system.scm |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/system.scm b/gnu/packages/system.scm
index e326e49..fb364f1 100644
--- a/gnu/packages/system.scm
+++ b/gnu/packages/system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,6 +26,27 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages linux))
 
+(define-public htop
+  (package
+   (name "htop")
+   (version "1.0.2")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://sourceforge/htop/"
+                  version "/htop-" version ".tar.gz"))
+            (sha256
+             (base32
+              "18fqrhvnm7h4c3939av8lpiwrwxbyw6hcly0jvq0vkjf0ixnaq7f"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("ncurses" ,ncurses)))
+   (home-page "http://htop.sourceforge.net/")
+   (synopsis "Interactive process viewer")
+   (description
+    "This is htop, an interactive process viewer.  It is a text-mode
+application (for console or X terminals) and requires ncurses.")
+   (license gpl2)))
+
 (define-public pies
   (package
     (name "pies")
-- 
1.7.10.4

[PATCH 2/2 v3] gnu: Add dfc.

[Cyril Roelandt]

* gnu/packages/system.scm (dfc): New variable.
---
 gnu/packages/system.scm |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/system.scm b/gnu/packages/system.scm
index fb364f1..1f8a7d5 100644
--- a/gnu/packages/system.scm
+++ b/gnu/packages/system.scm
@@ -21,11 +21,34 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages linux))
 
+(define-public dfc
+  (package
+   (name "dfc")
+   (version "3.0.3")
+   (source
+    (origin
+     (method url-fetch)
+      (uri (string-append
+            "http://projects.gw-computing.net/attachments/download/78/dfc-"
+            version ".tar.gz"))
+      (sha256
+       (base32
+        "1b4hfqv23l87cb37fxwzfk2sgspkyxpr3ig2hsd23hr6mm982j7z"))))
+   (build-system cmake-build-system)
+   (arguments '(#:tests? #f)) ; There are no tests.
+   (home-page "http://projects.gw-computing.net/projects/dfc")
+   (synopsis "Display file system space usage using graphs and colors.")
+   (description
+    "dfc (df color) is a modern version of df.  It uses colors, draws pretty
+graphs and can export its output to different formats.")
+   (license bsd-3)))
+
 (define-public htop
   (package
    (name "htop")
-- 
1.7.10.4

Re: [PATCH 1/2 v3] gnu: Add htop.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/sysutils.scm (htop): New variable.

Should be ‘system.scm’.  :-)

[...]

> +   (synopsis "Display file system space usage using graphs and colors.")

No period at the end.

Feel free to push, then!

Ludo’.