[bug#37350] [PATCH] Update emacs-interactive-align.

[bug#37350] [PATCH] Update emacs-interactive-align.

[Brian Leung]

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

See attached.

[-- Attachment #1.2: Type: text/html, Size: 35 bytes --]

[-- Attachment #2: 0001-gnu-emacs-interactive-align-Update-to-0.4.2-1.e1308c.patch --]
[-- Type: text/x-patch, Size: 2343 bytes --]

From fcdecc8e29fb4654d44c842a7efd4f266dde47ca Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Mon, 9 Sep 2019 06:46:32 +0200
Subject: [PATCH] gnu: emacs-interactive-align: Update to 0.4.2-1.e1308c8.

* gnu/packages/emacs-xyz.scm (emacs-interactive-align): Update to 0.4.2-1.e1308c8.
---
 gnu/packages/emacs-xyz.scm | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f3de24d825..6f0cd221a7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13187,23 +13187,26 @@ compilation/grep buffers.  Works with @code{wgrep}, @code{ack}, @code{ag},
       (license license:gpl3+))))
 
 (define-public emacs-interactive-align
-  (package
-    (name "emacs-interactive-align")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/mkcms/interactive-align/"
-                           "archive/" "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0sibpgb4lp6yy3pziak8f3hz4b28yj0dqy2nzh51z3d0b63h528m"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/mkcms/interactive-align/")
-    (synopsis "Interactive align-regexp command in Emacs")
-    (description "Interactive align-regexp command in Emacs")
-    (license license:gpl3+)))
+  (let ((commit "e1308c8f6aea05ad6dbcaa33b9bee4eb7e05ee39")
+        (revision "1"))
+    (package
+      (name "emacs-interactive-align")
+      (version (git-version "0.4.2" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mkcms/interactive-align.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0b7a2z4v1nyyaw0lvql9xrakpsi1a6kflqr74k56ndm3ivmqwx09"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/mkcms/interactive-align/")
+      (synopsis "Interactive align-regexp command in Emacs")
+      (description "Interactive align-regexp command in Emacs")
+      (license license:gpl3+))))
 
 (define-public emacs-shift-number
   (package
-- 
2.23.0

[bug#37350] [PATCH] Update emacs-interactive-align.

[Ludovic Courtès]

Hello,

Brian Leung <bkleung89@gmail.com> skribis:

> From fcdecc8e29fb4654d44c842a7efd4f266dde47ca Mon Sep 17 00:00:00 2001
> From: Brian Leung <bkleung89@gmail.com>
> Date: Mon, 9 Sep 2019 06:46:32 +0200
> Subject: [PATCH] gnu: emacs-interactive-align: Update to 0.4.2-1.e1308c8.
>
> * gnu/packages/emacs-xyz.scm (emacs-interactive-align): Update to 0.4.2-1.e1308c8.

Should we wait for the next upstream release instead of using what looks
like an arbitrary commit?

Thanks,
Ludo’.

[bug#37350] [PATCH] Update emacs-interactive-align.

[Brian Leung]

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

Hi Ludo,

I've attached an alternate update, which updates from the current Guix's
0.1.0 to 0.4.2 instead of from 0.1.0 to 0.4.2-some-commit.

I feel like the update to the nonversioned tree is slightly preferable
since of the seven commits where the nonversioned tree is ahead, five are
bugfixes and/or small refactors, one is a Readme change, and only one is a
feature addition. But I don't feel too strongly either way.

Best,
Brian

On Wed, Sep 11, 2019 at 2:15 PM Ludovic Courtès <ludo@gnu.org> wrote:

> Hello,
>
> Brian Leung <bkleung89@gmail.com> skribis:
>
> > From fcdecc8e29fb4654d44c842a7efd4f266dde47ca Mon Sep 17 00:00:00 2001
> > From: Brian Leung <bkleung89@gmail.com>
> > Date: Mon, 9 Sep 2019 06:46:32 +0200
> > Subject: [PATCH] gnu: emacs-interactive-align: Update to 0.4.2-1.e1308c8.
> >
> > * gnu/packages/emacs-xyz.scm (emacs-interactive-align): Update to
> 0.4.2-1.e1308c8.
>
> Should we wait for the next upstream release instead of using what looks
> like an arbitrary commit?
>
> Thanks,
> Ludo’.
>

[-- Attachment #1.2: Type: text/html, Size: 1586 bytes --]

[-- Attachment #2: 0001-gnu-emacs-interactive-align-Update-to-0.4.2.patch --]
[-- Type: text/x-patch, Size: 1621 bytes --]

From 2afac68981efd96f1a8dcfff82aadebca03744aa Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Wed, 11 Sep 2019 20:52:28 +0200
Subject: [PATCH] gnu: emacs-interactive-align: Update to 0.4.2.

* gnu/packages/emacs-xyz.scm (emacs-interactive-align): Update to 0.4.2.
---
 gnu/packages/emacs-xyz.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b5a20680ab..5c27bad647 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13189,16 +13189,17 @@ compilation/grep buffers.  Works with @code{wgrep}, @code{ack}, @code{ag},
 (define-public emacs-interactive-align
   (package
     (name "emacs-interactive-align")
-    (version "0.1.0")
+    (version "0.4.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/mkcms/interactive-align/"
-                           "archive/" "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mkcms/interactive-align.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "0sibpgb4lp6yy3pziak8f3hz4b28yj0dqy2nzh51z3d0b63h528m"))))
+         "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/mkcms/interactive-align/")
     (synopsis "Interactive align-regexp command in Emacs")
-- 
2.23.0

bug#37350: [PATCH] Update emacs-interactive-align.

[Ludovic Courtès]

Hello,

Brian Leung <bkleung89@gmail.com> skribis:

> I've attached an alternate update, which updates from the current Guix's
> 0.1.0 to 0.4.2 instead of from 0.1.0 to 0.4.2-some-commit.

Applied!

> I feel like the update to the nonversioned tree is slightly preferable
> since of the seven commits where the nonversioned tree is ahead, five are
> bugfixes and/or small refactors, one is a Readme change, and only one is a
> feature addition. But I don't feel too strongly either way.

Yeah, but then I’d argue that upstream should cut a new release.

Thanks,
Ludo’.