[PATCH] Update entr to 3.6

[PATCH] Update entr to 3.6

[Matthew Jordan]

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

Good Day,

This patch moves entr to the shellutils file.  And updates the version.


[-- Attachment #2: Update entr package. --]
[-- Type: text/x-patch, Size: 6594 bytes --]

From 4cae2720568bab62785bd48ae0536a49eafabb81 Mon Sep 17 00:00:00 2001
From: "Matthew O'N.S Jordan" <matthewjordannm@gmail.com>
Date: Sat, 20 Aug 2016 11:32:25 -0400
Subject: [PATCH] gnu: Modify entr

 * gnu/packages/shellutils.scm (entr): Updated package version.
 * gnu/packages/entr.scm (entr): Removed file.
---
 gnu/local.mk                |  1 -
 gnu/packages/entr.scm       | 66 ---------------------------------------------
 gnu/packages/shellutils.scm | 43 +++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 67 deletions(-)
 delete mode 100644 gnu/packages/entr.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index b8c5378..fe60187 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -111,7 +111,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/enchant.scm			\
   %D%/packages/engineering.scm			\
   %D%/packages/enlightenment.scm		\
-  %D%/packages/entr.scm				\
   %D%/packages/erlang.scm			\
   %D%/packages/fcitx.scm			\
   %D%/packages/feh.scm                          \
diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm
deleted file mode 100644
index 0e0f875..0000000
--- a/gnu/packages/entr.scm
+++ /dev/null
@@ -1,66 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
-;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; 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 entr)
-  #:use-module (guix licenses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
-
-(define-public entr
-  (package
-    (name "entr")
-    (version "3.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://entrproject.org/code/entr-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "05k4jyjna0pr2dalwc1l1dhrcyk6pw7hbss7jl4ykwfadcs5br73"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:test-target "test"
-       #:phases (modify-phases %standard-phases
-                  (replace 'configure
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        (setenv "CONFIG_SHELL" (which "bash"))
-                        (setenv "CC" (which "gcc"))
-                        (setenv "DESTDIR" (string-append out "/"))
-                        (setenv "PREFIX" "")
-                        (setenv "MANPREFIX" "man")
-                        (zero? (system* "./configure")))))
-                  (add-before 'build 'remove-fhs-file-names
-                    (lambda _
-                      ;; Use the tools available in $PATH.
-                      (substitute* "entr.c"
-                        (("/bin/cat") "cat")
-                        (("/usr/bin/clear") "clear")))))))
-    (home-page "http://entrproject.org/")
-    (synopsis "Run arbitrary commands when files change")
-    (description
-     "entr is a zero-configuration tool with no external build- or run-time
-dependencies.  The interface to entr is not only minimal, it aims to be simple
-enough to create a new category of ad hoc automation.  These micro-tests
-reduce keystrokes, but more importantly they emphasize the utility of
-automated checks.")
-
-    ;; Per 'LICENSE', portability code under missing/ is under BSD-2.
-    (license isc)))
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 27f45ba..be9aaf0 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -1,4 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;;
@@ -88,3 +89,45 @@ FreeDesktop.org trash can used by GNOME, KDE, XFCE, and other common desktop
 environments.  It can move files to the trash, and remove or list files that
 are already there.")
     (license gpl2+)))
+
+(define-public entr
+  (package
+    (name "entr")
+    (version "3.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://entrproject.org/code/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:test-target "test"
+       #:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (setenv "CONFIG_SHELL" (which "bash"))
+                        (setenv "CC" (which "gcc"))
+                        (setenv "DESTDIR" (string-append out "/"))
+                        (setenv "PREFIX" "")
+                        (setenv "MANPREFIX" "man")
+                        (zero? (system* "./configure")))))
+                  (add-before 'build 'remove-fhs-file-names
+                    (lambda _
+                      ;; Use the tools available in $PATH.
+                      (substitute* "entr.c"
+                        (("/bin/cat") "cat")
+                        (("/usr/bin/clear") "clear")))))))
+    (home-page "http://entrproject.org/")
+    (synopsis "Run arbitrary commands when files change")
+    (description
+     "entr is a zero-configuration tool with no external build- or run-time
+dependencies.  The interface to entr is not only minimal, it aims to be simple
+enough to create a new category of ad hoc automation.  These micro-tests
+reduce keystrokes, but more importantly they emphasize the utility of
+automated checks.")
+
+    ;; Per 'LICENSE', portability code under missing/ is under BSD-2.
+    (license isc)))
-- 
2.9.0


[-- Attachment #3: Type: text/plain, Size: 31 bytes --]


Respectuflly,

Matthew Jordan

Re: [PATCH] Update entr to 3.6

[Efraim Flashner]

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

On Sun, Aug 21, 2016 at 12:18:15PM -0400, Matthew Jordan wrote:
> Good Day,
> 
> This patch moves entr to the shellutils file.  And updates the version.
> 

This looks good, but it should be two patches, one to update entr and a
second to move it to shellutils.scm. Can you send an updated patch?

Thanks.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

Re: [PATCH] Update entr to 3.6

[Matthew Jordan]

Good Day,

Sorry for late reply been a bit busy with work.  About this package, do
I still need to send seperate patches for the move and the update or has
this patch already been applied?

Thanks,
Matthew.

Efraim Flashner writes:

> On Sun, Aug 21, 2016 at 12:18:15PM -0400, Matthew Jordan wrote:
>> Good Day,
>> 
>> This patch moves entr to the shellutils file.  And updates the version.
>> 
>
> This looks good, but it should be two patches, one to update entr and a
> second to move it to shellutils.scm. Can you send an updated patch?
>
> Thanks.

Re: [PATCH] Update entr to 3.6

[Efraim Flashner]

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

On Thu, Sep 08, 2016 at 05:28:06AM -0400, Matthew Jordan wrote:
> Good Day,
> 
> Sorry for late reply been a bit busy with work.  About this package, do
> I still need to send seperate patches for the move and the update or has
> this patch already been applied?
> 
> Thanks,
> Matthew.
> 
> 

The update to 3.6 has been applied separately, moving it to shells.scm
has not.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

Re: [PATCH] Update entr to 3.6

[Leo Famulari]

On Sun, Aug 21, 2016 at 12:18:15PM -0400, Matthew Jordan wrote:
> Good Day,
> 
> This patch moves entr to the shellutils file.  And updates the version.
> 

> From 4cae2720568bab62785bd48ae0536a49eafabb81 Mon Sep 17 00:00:00 2001
> From: "Matthew O'N.S Jordan" <matthewjordannm@gmail.com>
> Date: Sat, 20 Aug 2016 11:32:25 -0400
> Subject: [PATCH] gnu: Modify entr
> 
>  * gnu/packages/shellutils.scm (entr): Updated package version.
>  * gnu/packages/entr.scm (entr): Removed file.
> ---
>  gnu/local.mk                |  1 -
>  gnu/packages/entr.scm       | 66 ---------------------------------------------
>  gnu/packages/shellutils.scm | 43 +++++++++++++++++++++++++++++

I took the update part of this patch and applied it alone.

Moving packages around has some drawbacks. Notably, users will have to
adjust their module imports anywhere they use the affected packages.
Also, these changes tend to create annoying merge conflicts between the
master branch and any *-updates branches we may be using.

Thanks for paying attention to this package!