Re: [PATCH] gnu: Add di.

[John J Foerch]

Alex Kost <address@hidden> writes:

> John J Foerch (2016-07-04 06:47 +0300) wrote:
>
>> John J Foerch <address@hidden> writes:
>>
>>> Leo Famulari <address@hidden> writes:
>>>
>>>> On Sat, Jul 02, 2016 at 03:13:52PM -0400, John J Foerch wrote:
>>>>> * gnu/packages/admin.scm (di): New variable.
>>>>
>>>> Thanks!
>>>>
>>>>> +    (arguments
>>>>> +     `(#:phases
>>>>> +       (modify-phases %standard-phases
>>>>> +         (delete 'configure)
>>>>> +         (delete 'check)
>>>>
>>>> Did you try setting `#:test-target "test"` in the arguments? The
>>>> Makefile has a test target.
>>>>
>>>
>>> I didn't know about that.  I'll try it out.
>>>
>> A test relating to an included perl module Filesys::di fails.  I hadn't
>> intended to include that module in the package, as all I'm interested in
>> is the 'di' binary.  Given that, I would suggest that we bypass the
>> tests.
>
> As for me, I would also disable the tests.  All these handmade Makefiles
> in all sub-directories are a nightmare.  I think trying to figure out
> what is needed to run the tests doesn't worth it.
>
> Also don't forget to add a copyright line for yourself in the beginning
> of "admin.scm".

Here is an updated patch:

>From 05098e58a85149c96597bbacec5f0f9ef200d299 Mon Sep 17 00:00:00 2001
From: "John J. Foerch" <address@hidden>
Date: Sat, 2 Jul 2016 15:08:30 -0400
Subject: [PATCH] gnu: Add di.

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

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 415a35a..0fd2c87 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Peter Feigl <address@hidden>
+;;; Copyright © 2016 John J. Foerch <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1708,3 +1709,34 @@ throughput (in the same interval).")
      "The Fuck tries to match a rule for a previous, mistyped command, creates
 a new command using the matched rule, and runs it.")
     (license license:x11)))
+
+(define-public di
+  (package
+    (name "di")
+    (version "4.42")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://gentoo.com/di/di-"; version ".tar.gz"))
+       (sha256
+        (base32 "1i6m9zdnidn8268q1lz9fd8payk7s4pgwh5zlam9rr4dy6h6a67n"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'check)
+         (add-before 'build 'setup-environment
+           (lambda* (#:key outputs #:allow-other-keys)
+             (setenv "CC" "gcc")
+             (setenv "prefix" (assoc-ref outputs "out"))
+             #t)))
+       #:make-flags (list "-e")))
+    (home-page "https://www.gentoo.com/di/";)
+    (synopsis "Advanced df like disk information utility")
+    (description
+     "'di' is a disk information utility, displaying everything
+(and more) that your @code{df} command does.  It features the ability to
+display your disk usage in whatever format you prefer.  It is designed to be
+highly portable.  Great for heterogenous networks.")
+    (license license:zlib)))
-- 
2.9.0