[bug#27790] text-editor: mg

[bug#27790] text-editor: mg

[ng0]

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

This adds a package from one of my repositories, mg.
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org

[-- Attachment #1.2: 0001-gnu-Add-mg.patch --]
[-- Type: text/plain, Size: 3501 bytes --]

From d1cae87a9b13b5624deb16666a1da3333bd05681 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Sat, 22 Jul 2017 11:31:37 +0000
Subject: [PATCH] gnu: Add mg.

* gnu/packages/text-editors.scm (mg): New variable.
---
 gnu/packages/text-editors.scm | 57 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 98df48119..9277dd1f5 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2017 Feng Shu <tumashu@163.com>
-;;; Copyright © 2017 ng0 <ng0@no-reply.pragmatique.xyz>
+;;; Copyright © 2017 ng0 <ng0@infotropique.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,6 +34,7 @@
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages libbsd)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
@@ -227,3 +228,57 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
 16, 32, and 64-bit CPUs.")
     (supported-systems '("x86_64-linux" "i686-linux"))
     (license license:gpl2+)))
+
+(define-public mg
+  (package
+    (name "mg")
+    (version "20170401")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://homepage.boetes.org/software/mg/"
+                           "mg-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1arasswgdadbb265rahq3867r9s54jva6k4m3p5n0f8mgjqhhdha"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; There is no testsuite
+       #:make-flags (list "CC=gcc")
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure) ; There is no configure script
+         (add-before 'build 'replace-usr
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "GNUmakefile"
+               (("/usr/bin/") "")
+               (("/usr/local")
+                (assoc-ref outputs "out")))
+             #t))
+         (add-before 'build 'correct-location-of-difftool
+           (lambda _
+             (substitute* "buffer.c"
+               (("/usr/bin/diff")
+                (which "diff")))
+             #t))
+         (add-before 'install 'install-tutorial
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; This isn't handled by install but is expect
+             ;; by the tutorial part of mg to be present.
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (string-append out "/share/doc/mg")))
+               (install-file "tutorial"
+                             (string-append doc "/tutorial"))
+               #t))))))
+    (inputs
+     `(("ncurses" ,ncurses)
+       ("libbsd" ,libbsd)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://homepage.boetes.org/software/mg/")
+    (synopsis "OpenBSD variant of the editor mg")
+    (description
+     "Mg is a public domain text editor intended to loosely resemble
+GNU Emacs, while still retaining fast speed and a small memory footprint.
+It is based on MicroEMACS.")
+    (license license:public-domain)))
-- 
2.13.3


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

[bug#27790] text-editor: mg

[Tobias Geerinckx-Rice]

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

ng0,

Thanks! Some minor points, most of which can be taken care of by the
committer (i.e. probably me) when they push:

ng0 wrote on 22/07/17 at 13:36:
> From d1cae87a9b13b5624deb16666a1da3333bd05681 Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@infotropique.org>
> Date: Sat, 22 Jul 2017 11:31:37 +0000
> Subject: [PATCH] gnu: Add mg.
> 
> * gnu/packages/text-editors.scm (mg): New variable.
> ---
>  gnu/packages/text-editors.scm | 57 ++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 56 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
> index 98df48119..9277dd1f5 100644
> --- a/gnu/packages/text-editors.scm
> +++ b/gnu/packages/text-editors.scm
> @@ -3,7 +3,7 @@
>  ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
>  ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
>  ;;; Copyright © 2017 Feng Shu <tumashu@163.com>
> -;;; Copyright © 2017 ng0 <ng0@no-reply.pragmatique.xyz>
> +;;; Copyright © 2017 ng0 <ng0@infotropique.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -34,6 +34,7 @@
>    #:use-module (gnu packages gcc)
>    #:use-module (gnu packages glib)
>    #:use-module (gnu packages gtk)
> +  #:use-module (gnu packages libbsd)
>    #:use-module (gnu packages lua)
>    #:use-module (gnu packages ncurses)
>    #:use-module (gnu packages pkg-config)
> @@ -227,3 +228,57 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
>  16, 32, and 64-bit CPUs.")
>      (supported-systems '("x86_64-linux" "i686-linux"))
>      (license license:gpl2+)))
> +
> +(define-public mg
> +  (package
> +    (name "mg")
> +    (version "20170401")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "http://homepage.boetes.org/software/mg/"
> +                           "mg-" version ".tar.gz"))

HTTPS works, so let's use it just because we can. Same for home-page.

> +       (sha256
> +        (base32
> +         "1arasswgdadbb265rahq3867r9s54jva6k4m3p5n0f8mgjqhhdha"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:tests? #f ; There is no testsuite

s/There/there/, and s/testsuite/test suite/ since I'm already being
pedantic.

> +       #:make-flags (list "CC=gcc")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (delete 'configure) ; There is no configure script

Same here.

> +         (add-before 'build 'replace-usr
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (substitute* "GNUmakefile"
> +               (("/usr/bin/") "")
> +               (("/usr/local")
> +                (assoc-ref outputs "out")))
> +             #t))
> +         (add-before 'build 'correct-location-of-difftool
> +           (lambda _
> +             (substitute* "buffer.c"
> +               (("/usr/bin/diff")
> +                (which "diff")))

Cool. I learn new things every day.

> +             #t))
> +         (add-before 'install 'install-tutorial
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             ;; This isn't handled by install but is expect

s/expect/expected/, but:

> +             ;; by the tutorial part of mg to be present.

What exactly do you mean by ‘the tutorial part of mg’? I tried C-h t
with no result, and the only mentions of ‘tutorial’ in the tarball are
in the manual page and the tutorial itself.

> +             (let* ((out (assoc-ref outputs "out"))
> +                    (doc (string-append out "/share/doc/mg")))
> +               (install-file "tutorial"
> +                             (string-append doc "/tutorial"))
> +               #t))))))
> +    (inputs
> +     `(("ncurses" ,ncurses)
> +       ("libbsd" ,libbsd)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (home-page "http://homepage.boetes.org/software/mg/")
> +    (synopsis "OpenBSD variant of the editor mg")

This appears to be the canonical modern ‘portable’ mg, so I'd move the
OpenBSD bit to the description. We're packaging this as mg, after all,
not mg-openbsd. What do you think of "Small and fast text editor in the
style of GNU Emacs"?

> +    (description
> +     "Mg is a public domain text editor intended to loosely resemble
> +GNU Emacs, while still retaining fast speed and a small memory footprint.
> +It is based on MicroEMACS.")

‘Public-domain’ can be dropped, and IMO so can its MicroEMACS history.
This does leave us with a very short description indeed...

> +    (license license:public-domain)))

True freedom™!

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 504 bytes --]

[bug#27790] text-editor: mg

[ng0]

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

Tobias Geerinckx-Rice transcribed 5.9K bytes:
> ng0,
> 
> Thanks! Some minor points, most of which can be taken care of by the
> committer (i.e. probably me) when they push:
> 
> ng0 wrote on 22/07/17 at 13:36:
> > From d1cae87a9b13b5624deb16666a1da3333bd05681 Mon Sep 17 00:00:00 2001
> > From: ng0 <ng0@infotropique.org>
> > Date: Sat, 22 Jul 2017 11:31:37 +0000
> > Subject: [PATCH] gnu: Add mg.
> > 
> > * gnu/packages/text-editors.scm (mg): New variable.
> > ---
> >  gnu/packages/text-editors.scm | 57 ++++++++++++++++++++++++++++++++++++++++++-
> >  1 file changed, 56 insertions(+), 1 deletion(-)
> > 
> > diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
> > index 98df48119..9277dd1f5 100644
> > --- a/gnu/packages/text-editors.scm
> > +++ b/gnu/packages/text-editors.scm
> > @@ -3,7 +3,7 @@
> >  ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
> >  ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
> >  ;;; Copyright © 2017 Feng Shu <tumashu@163.com>
> > -;;; Copyright © 2017 ng0 <ng0@no-reply.pragmatique.xyz>
> > +;;; Copyright © 2017 ng0 <ng0@infotropique.org>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -34,6 +34,7 @@
> >    #:use-module (gnu packages gcc)
> >    #:use-module (gnu packages glib)
> >    #:use-module (gnu packages gtk)
> > +  #:use-module (gnu packages libbsd)
> >    #:use-module (gnu packages lua)
> >    #:use-module (gnu packages ncurses)
> >    #:use-module (gnu packages pkg-config)
> > @@ -227,3 +228,57 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
> >  16, 32, and 64-bit CPUs.")
> >      (supported-systems '("x86_64-linux" "i686-linux"))
> >      (license license:gpl2+)))
> > +
> > +(define-public mg
> > +  (package
> > +    (name "mg")
> > +    (version "20170401")
> > +    (source
> > +     (origin
> > +       (method url-fetch)
> > +       (uri (string-append "http://homepage.boetes.org/software/mg/"
> > +                           "mg-" version ".tar.gz"))
> 
> HTTPS works, so let's use it just because we can. Same for home-page.

Ah. It does not redirect http->https though, so I didn't notice.

> > +       (sha256
> > +        (base32
> > +         "1arasswgdadbb265rahq3867r9s54jva6k4m3p5n0f8mgjqhhdha"))))
> > +    (build-system gnu-build-system)
> > +    (arguments
> > +     `(#:tests? #f ; There is no testsuite
> 
> s/There/there/, and s/testsuite/test suite/ since I'm already being
> pedantic.
> 
> > +       #:make-flags (list "CC=gcc")
> > +       #:phases
> > +       (modify-phases %standard-phases
> > +         (delete 'configure) ; There is no configure script
> 
> Same here.
> 
> > +         (add-before 'build 'replace-usr
> > +           (lambda* (#:key outputs #:allow-other-keys)
> > +             (substitute* "GNUmakefile"
> > +               (("/usr/bin/") "")
> > +               (("/usr/local")
> > +                (assoc-ref outputs "out")))
> > +             #t))
> > +         (add-before 'build 'correct-location-of-difftool
> > +           (lambda _
> > +             (substitute* "buffer.c"
> > +               (("/usr/bin/diff")
> > +                (which "diff")))
> 
> Cool. I learn new things every day.
> 
> > +             #t))
> > +         (add-before 'install 'install-tutorial
> > +           (lambda* (#:key outputs #:allow-other-keys)
> > +             ;; This isn't handled by install but is expect
> 
> s/expect/expected/, but:
> 
> > +             ;; by the tutorial part of mg to be present.
> 
> What exactly do you mean by ‘the tutorial part of mg’? I tried C-h t
> with no result, and the only mentions of ‘tutorial’ in the tarball are
> in the manual page and the tutorial itself.

I'm not sure. It is good to have it I think, but this wasn't my idea.
So maybe just drop the comment?

> > +             (let* ((out (assoc-ref outputs "out"))
> > +                    (doc (string-append out "/share/doc/mg")))
> > +               (install-file "tutorial"
> > +                             (string-append doc "/tutorial"))
> > +               #t))))))
> > +    (inputs
> > +     `(("ncurses" ,ncurses)
> > +       ("libbsd" ,libbsd)))
> > +    (native-inputs
> > +     `(("pkg-config" ,pkg-config)))
> > +    (home-page "http://homepage.boetes.org/software/mg/")
> > +    (synopsis "OpenBSD variant of the editor mg")
> 
> This appears to be the canonical modern ‘portable’ mg, so I'd move the
> OpenBSD bit to the description. We're packaging this as mg, after all,
> not mg-openbsd. What do you think of "Small and fast text editor in the
> style of GNU Emacs"?

Ok.

> > +    (description
> > +     "Mg is a public domain text editor intended to loosely resemble
> > +GNU Emacs, while still retaining fast speed and a small memory footprint.
> > +It is based on MicroEMACS.")
> 
> ‘Public-domain’ can be dropped, and IMO so can its MicroEMACS history.
> This does leave us with a very short description indeed...

Ok.

> > +    (license license:public-domain)))
> 
> True freedom™!
> 
> T G-R
> 



thanks!
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org

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

[bug#27790] text-editor: mg

[Ludovic Courtès]

Heya,

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> ng0 wrote on 22/07/17 at 13:36:
>> From d1cae87a9b13b5624deb16666a1da3333bd05681 Mon Sep 17 00:00:00 2001
>> From: ng0 <ng0@infotropique.org>
>> Date: Sat, 22 Jul 2017 11:31:37 +0000
>> Subject: [PATCH] gnu: Add mg.
>> 
>> * gnu/packages/text-editors.scm (mg): New variable.

This package already exists.  I’m moving it from mg.scm to
text-editors.scm.

ng0, please see if you’d like to make further changes.  Otherwise we can
close this issue.

Thanks,
Ludo’.

[bug#27790] text-editor: mg

[ng0]

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

Ludovic Courtès transcribed 0.5K bytes:
> Heya,
> 
> Tobias Geerinckx-Rice <me@tobias.gr> skribis:
> 
> > ng0 wrote on 22/07/17 at 13:36:
> >> From d1cae87a9b13b5624deb16666a1da3333bd05681 Mon Sep 17 00:00:00 2001
> >> From: ng0 <ng0@infotropique.org>
> >> Date: Sat, 22 Jul 2017 11:31:37 +0000
> >> Subject: [PATCH] gnu: Add mg.
> >> 
> >> * gnu/packages/text-editors.scm (mg): New variable.
> 
> This package already exists.  I’m moving it from mg.scm to
> text-editors.scm.

damn, didn't notice it :D

> ng0, please see if you’d like to make further changes.  Otherwise we can
> close this issue.

Yes, 2 things with the in-tree version:

1. 20161005 -> needs an update
2. I think there was a reason why I patched up buffer.c to point to
diff instead of /usr/bin/diff, we could reuse that.

I can send these two in new patches when you've moved mg to text-editors.scm,
or do yo uwant to do it?

> Thanks,
> Ludo’.
> 

-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org

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

[bug#27790] text-editor: mg

[ng0]

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

ng0 transcribed 2.1K bytes:
> Ludovic Courtès transcribed 0.5K bytes:
> > Heya,
> > 
> > Tobias Geerinckx-Rice <me@tobias.gr> skribis:
> > 
> > > ng0 wrote on 22/07/17 at 13:36:
> > >> From d1cae87a9b13b5624deb16666a1da3333bd05681 Mon Sep 17 00:00:00 2001
> > >> From: ng0 <ng0@infotropique.org>
> > >> Date: Sat, 22 Jul 2017 11:31:37 +0000
> > >> Subject: [PATCH] gnu: Add mg.
> > >> 
> > >> * gnu/packages/text-editors.scm (mg): New variable.
> > 
> > This package already exists.  I’m moving it from mg.scm to
> > text-editors.scm.
> 
> damn, didn't notice it :D
> 
> > ng0, please see if you’d like to make further changes.  Otherwise we can
> > close this issue.
> 
> Yes, 2 things with the in-tree version:
> 
> 1. 20161005 -> needs an update
> 2. I think there was a reason why I patched up buffer.c to point to
> diff instead of /usr/bin/diff, we could reuse that.

One more: source, according to Tobias, is accessible via https.

> I can send these two in new patches when you've moved mg to text-editors.scm,
> or do yo uwant to do it?
> 
> > Thanks,
> > Ludo’.
> > 
> 
> -- 
> ng0
> GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
> GnuPG: https://n0is.noblogs.org/my-keys
> https://www.infotropique.org https://krosos.org



-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org

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

[bug#27790] text-editor: mg

[ng0]

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

Patches.

1: Update
2: Fetch via https
3: new phase to use our "diff"
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org

[-- Attachment #1.2: 0001-gnu-mg-Update-to-20170401.patch --]
[-- Type: text/plain, Size: 1677 bytes --]

From ff4bcddd0eeeb1de283ef0931ac73d698026d6c6 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Wed, 26 Jul 2017 14:21:21 +0000
Subject: [PATCH 1/3] gnu: mg: Update to 20170401.

* gnu/packages/text-editors.scm (mg): Update to 20170401.
---
 gnu/packages/text-editors.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 756c2beab..7b9732ab8 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2017 Feng Shu <tumashu@163.com>
-;;; Copyright © 2017 ng0 <ng0@no-reply.pragmatique.xyz>
+;;; Copyright © 2017 ng0 <ng0@infotropique.org>
 ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -234,14 +234,14 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
 (define-public mg
   (package
     (name "mg")
-    (version "20161005")
+    (version "20170401")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://homepage.boetes.org/software/mg/mg-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p"))
+                "1arasswgdadbb265rahq3867r9s54jva6k4m3p5n0f8mgjqhhdha"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.13.3


[-- Attachment #1.3: 0002-gnu-mg-Fetch-source-via-HTTPS.patch --]
[-- Type: text/plain, Size: 1002 bytes --]

From e21e12416918266b7f3660b62ccd2784012c00f0 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Wed, 26 Jul 2017 14:22:54 +0000
Subject: [PATCH 2/3] gnu: mg: Fetch source via HTTPS.

* gnu/packages/text-editors.scm (mg)[source]: Use HTTPS.
---
 gnu/packages/text-editors.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 7b9732ab8..7357df7fb 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -237,7 +237,7 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
     (version "20170401")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://homepage.boetes.org/software/mg/mg-"
+              (uri (string-append "https://homepage.boetes.org/software/mg/mg-"
                                   version ".tar.gz"))
               (sha256
                (base32
-- 
2.13.3


[-- Attachment #1.4: 0003-gnu-mg-Add-new-phase-to-find-diff.patch --]
[-- Type: text/plain, Size: 1247 bytes --]

From cc80c01c3732f8881a05c6afea0fff363311ffa0 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@infotropique.org>
Date: Wed, 26 Jul 2017 14:24:56 +0000
Subject: [PATCH 3/3] gnu: mg: Add new phase to find 'diff'.

* gnu/packages/text-editors.scm (mg)[phases]: Add new 'correct-location-of-difftool'.
---
 gnu/packages/text-editors.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 7357df7fb..7843c120a 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -261,6 +261,12 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
                           "CC=gcc")
        #:phases (modify-phases %standard-phases
                   (delete 'configure)
+                  (add-before 'build 'correct-location-of-difftool
+                    (lambda _
+                      (substitute* "buffer.c"
+                        (("/usr/bin/diff")
+                         (which "diff")))
+                      #t))
                   (add-before 'install 'patch-tutorial-location
                     (lambda* (#:key outputs #:allow-other-keys)
                       (substitute* "mg.1"
-- 
2.13.3


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

bug#27790: text-editor: mg

[Ludovic Courtès]

ng0 <ng0@infotropique.org> skribis:

> Patches.
>
> 1: Update
> 2: Fetch via https
> 3: new phase to use our "diff"

Applied all three patches, thank you!

Ludo’.