Update of Emacs to 26.1.

Update of Emacs to 26.1.

[Ricardo Wurmus]

Hi Mathieu,

I saw that you updated the “emacs” package to 26.1.  Thank you!  Shortly
thereafter you reverted that change with a comment about better doing
this on core-updates.

Could you please explain why?

The update did break “emacs-minimal” and thus all Emacs packages, but
that can be fixed by passing “--with-gnutls=no” to emacs-minimal:

--8<---------------cut here---------------start------------->8---
commit 34b24b68b0b06716280f0040e5ee9381ccd640ad
Author: Ricardo Wurmus <rekado@elephly.net>
Date:   Mon May 28 19:16:13 2018 +0200

    gnu: emacs-minimal: Fix build by disabling gnutls support.
    
    This is a follow-up to bb82c3d42bb95588f40394f4d71f915654c0e643.
    
    * gnu/packages/emacs.scm (emacs-minimal)[arguments]: Disable gnutls support.

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fc7f52a32..ab7ecf033 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -244,10 +244,11 @@ languages.")
     (synopsis "The extensible text editor (used only for byte-compilation)")
     (build-system gnu-build-system)
     (arguments
-     (substitute-keyword-arguments (package-arguments emacs)
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (delete 'install-site-start)))))
+     `(#:configure-flags (list "--with-gnutls=no")
+       ,@(substitute-keyword-arguments (package-arguments emacs)
+           ((#:phases phases)
+            `(modify-phases ,phases
+               (delete 'install-site-start))))))
     (inputs
      `(("ncurses" ,ncurses)))
     (native-inputs
--8<---------------cut here---------------end--------------->8---

The update causes about 380 packages to be rebuilt, but many of them are
small Emacs packages that are quick to build.

I don’t think Emacs updates need to be done on core-updates.

-- 
Ricardo

Re: Update of Emacs to 26.1.

[Mathieu Othacehe]

Hi Ricardo,

> Could you please explain why?
>
> The update did break “emacs-minimal” and thus all Emacs packages, but
> that can be fixed by passing “--with-gnutls=no” to emacs-minimal:

Sorry for this messy, aborted update. I first noticed that emacs-minimal
was broken it fixed it with the exact same patch as the one you
proposed. Then, I saw that emacs-s and emacs-f were broken. I guess
other packages might be broken, but I didn't push the analysis further.


Mathieu

Re: Update of Emacs to 26.1.

[Ricardo Wurmus]

Hi Mathieu,

>> The update did break “emacs-minimal” and thus all Emacs packages, but
>> that can be fixed by passing “--with-gnutls=no” to emacs-minimal:
>
> Sorry for this messy, aborted update. I first noticed that emacs-minimal
> was broken it fixed it with the exact same patch as the one you
> proposed. Then, I saw that emacs-s and emacs-f were broken. I guess
> other packages might be broken, but I didn't push the analysis further.

Yes, I also saw emacs-dash failing to build, but I didn’t look more
closely.

-- 
Ricardo

Re: Update of Emacs to 26.1.

[Alex Kost]

Ricardo Wurmus (2018-05-28 21:25 +0200) wrote:

[...]
> The update did break “emacs-minimal” and thus all Emacs packages, but
> that can be fixed by passing “--with-gnutls=no” to emacs-minimal:

I like it!  I think '*-minimal' packages should be as minimal as possible.

-- 
Alex

Re: Update of Emacs to 26.1.

[Ricardo Wurmus]

Alex Kost <alezost@gmail.com> writes:

> Ricardo Wurmus (2018-05-28 21:25 +0200) wrote:
>
> [...]
>> The update did break “emacs-minimal” and thus all Emacs packages, but
>> that can be fixed by passing “--with-gnutls=no” to emacs-minimal:
>
> I like it!  I think '*-minimal' packages should be as minimal as possible.

“emacs-minimal” already didn’t have gnutls among its inputs, but the
build system now complains about this unless the configure flags make
that explicit to show intent.

After the update “emacs-minimal” broke because the build system couldn’t
find gnutls (because it wasn’t among the inputs) and because we didn’t
indicate that this was intentional.

-- 
Ricardo

Re: Update of Emacs to 26.1.

[Mathieu Othacehe]

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


Hello,

Here is a serie to update emacs and the broken dependencies I found,
what do you think?

Thanks,

Mathieu

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-Update-to-26.1.patch --]
[-- Type: text/x-diff, Size: 3151 bytes --]

From d81c7664d0064b3d3586b0c8120dc81439bbb093 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Mon, 28 May 2018 18:23:07 +0200
Subject: [PATCH 1/4] gnu: emacs: Update to 26.1.

* gnu/packages/emacs.scm (emacs): Update to 26.1,
[arguments]: disable tests as they do not exist in release.
* gnu/packages/patches/emacs-fix-scheme-indent-function.patch: Update patch
indentation and line numbers.
---
 gnu/packages/emacs.scm                                     |  7 ++++---
 .../patches/emacs-fix-scheme-indent-function.patch         | 14 +++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fc7f52a..fbe188f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -114,14 +114,14 @@
 (define-public emacs
   (package
     (name "emacs")
-    (version "25.3")
+    (version "26.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/emacs/emacs-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"))
+               "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"))
              (patches (search-patches "emacs-exec-path.patch"
                                       "emacs-fix-scheme-indent-function.patch"
                                       "emacs-source-date-epoch.patch"))
@@ -159,7 +159,8 @@
                      " ")))))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:phases
+     `(#:tests? #f  ; no check target
+       #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'fix-/bin/pwd
            (lambda _
diff --git a/gnu/packages/patches/emacs-fix-scheme-indent-function.patch b/gnu/packages/patches/emacs-fix-scheme-indent-function.patch
index c5a4268..4b7904e 100644
--- a/gnu/packages/patches/emacs-fix-scheme-indent-function.patch
+++ b/gnu/packages/patches/emacs-fix-scheme-indent-function.patch
@@ -14,16 +14,16 @@ The fix is made by Mark H Weaver <mhw@netris.org>:
 
 --- a/lisp/progmodes/scheme.el
 +++ b/lisp/progmodes/scheme.el
-@@ -482,6 +482,12 @@
- 			(> (length function) 3)
- 			(string-match "\\`def" function)))
- 	       (lisp-indent-defform state indent-point))
+@@ -494,6 +494,12 @@ indentation."
+                         (> (length function) 3)
+                         (string-match "\\`def" function)))
+                (lisp-indent-defform state indent-point))
 +              ((and (null method)
 +                    (> (length function) 1)
 +                    ;; The '#' in '#:' seems to get lost, not sure why
 +                    (string-match "\\`:" function))
 +               (let ((lisp-body-indent 1))
 +                 (lisp-indent-defform state indent-point)))
- 	      ((integerp method)
- 	       (lisp-indent-specform method state
- 				     indent-point normal-indent))
+               ((integerp method)
+                (lisp-indent-specform method state
+                                      indent-point normal-indent))
-- 
2.7.4


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-emacs-minimal-Fix-build.patch --]
[-- Type: text/x-diff, Size: 1218 bytes --]

From 7bb48df5ee229ab3e5ab028db92ec0ca927d237b Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Mon, 28 May 2018 19:07:53 +0200
Subject: [PATCH 2/4] gnu: emacs-minimal: Fix build.

* gnu/packages/emacs.scm: (emacs-minimal): Pass "--with-gnutls=no" is required
to build without gnutls since emacs version 26.1.
---
 gnu/packages/emacs.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fbe188f..2103eca 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -245,10 +245,11 @@ languages.")
     (synopsis "The extensible text editor (used only for byte-compilation)")
     (build-system gnu-build-system)
     (arguments
-     (substitute-keyword-arguments (package-arguments emacs)
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (delete 'install-site-start)))))
+     `(#:configure-flags '("--with-gnutls=no")
+       ,@(substitute-keyword-arguments (package-arguments emacs)
+           ((#:phases phases)
+            `(modify-phases ,phases
+               (delete 'install-site-start))))))
     (inputs
      `(("ncurses" ,ncurses)))
     (native-inputs
-- 
2.7.4


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-emacs-s-Disable-tests.patch --]
[-- Type: text/x-diff, Size: 1172 bytes --]

From d0b615809a33ab59d077576e68c79b415852b4a2 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Tue, 29 May 2018 11:45:07 +0200
Subject: [PATCH 3/4] gnu: emacs-s: Disable tests.

* gnu/packages/emacs.scm (emacs-s): Since emacs version 26, the tests defined
in this package fail at first evaluation and succeed after, probably due to
macro expansion.
---
 gnu/packages/emacs.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 2103eca..0673f2d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1790,8 +1790,9 @@ allows easily move between them.")
                 "0xbl75863pcm806zg0x1lw7qznzjq2c8320k8js7apyag8q4srvh"))))
     (build-system emacs-build-system)
     (arguments
-     `(#:tests? #t
-       #:test-command '("./run-tests.sh")))
+     ;; FIXME: ert tests fail randomly, probably due to macro usage
+     ;; in examples.el.
+     `(#:tests? #f))
     (home-page "https://github.com/magnars/s.el")
     (synopsis "Emacs string manipulation library")
     (description "This package provides an Emacs library for manipulating
-- 
2.7.4


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-gnu-emacs-dash-Update-to-2.14.1.patch --]
[-- Type: text/x-diff, Size: 1154 bytes --]

From 7133b98a9a65cb85c9fb56db9569fd95388c9549 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Tue, 29 May 2018 11:42:09 +0200
Subject: [PATCH 4/4] gnu: emacs-dash: Update to 2.14.1.

* gnu/packages/emacs.scm (emacs-dash): Update to 2.14.1.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 0673f2d..22cb7c8 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1579,7 +1579,7 @@ and stored in memory.")
 (define-public emacs-dash
   (package
     (name "emacs-dash")
-    (version "2.13.0")
+    (version "2.14.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1588,7 +1588,7 @@ and stored in memory.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1pjlkrzr8n45bnp3xs3dybvy0nz3gwamrfc7vsi1nhpkkw99ihhb"))))
+                "0zhibnyj5ckf9al92bswdgli7jy2n4jwsz6n9v2i80kd3p4cmrds"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
-- 
2.7.4

Re: Update of Emacs to 26.1.

[Ricardo Wurmus]

Hi Mathieu,

> Here is a serie to update emacs and the broken dependencies I found,
> what do you think?

Heh, I *just* finished the update myself and came up with very similar
patches to yours.

> Subject: [PATCH 1/4] gnu: emacs: Update to 26.1.
>
> * gnu/packages/emacs.scm (emacs): Update to 26.1,
> [arguments]: disable tests as they do not exist in release.
> * gnu/packages/patches/emacs-fix-scheme-indent-function.patch: Update patch
> indentation and line numbers.

Ok.  I’ll take this instead of my revert of your revert :)

> Subject: [PATCH 2/4] gnu: emacs-minimal: Fix build.
>
> * gnu/packages/emacs.scm: (emacs-minimal): Pass "--with-gnutls=no" is required
> to build without gnutls since emacs version 26.1.

The wording is odd here, but the patch is the same as mine.

> From d0b615809a33ab59d077576e68c79b415852b4a2 Mon Sep 17 00:00:00 2001
> From: Mathieu Othacehe <m.othacehe@gmail.com>
> Date: Tue, 29 May 2018 11:45:07 +0200
> Subject: [PATCH 3/4] gnu: emacs-s: Disable tests.
>
> * gnu/packages/emacs.scm (emacs-s): Since emacs version 26, the tests defined
> in this package fail at first evaluation and succeed after, probably due to
> macro expansion.

I found that using the “#:emacs ,emacs” makes the tests pass, so I’d
prefer that over disabling the tests.

> From 7133b98a9a65cb85c9fb56db9569fd95388c9549 Mon Sep 17 00:00:00 2001
> From: Mathieu Othacehe <m.othacehe@gmail.com>
> Date: Tue, 29 May 2018 11:42:09 +0200
> Subject: [PATCH 4/4] gnu: emacs-dash: Update to 2.14.1.
>
> * gnu/packages/emacs.scm (emacs-dash): Update to 2.14.1.

I did the same but also took the sources from git because the generated
tarballs are not reliable.

I’ll push a mix of our patches to master in the next few minutes.

Thanks!

--
Ricardo

Re: Update of Emacs to 26.1.

[Mathieu Othacehe]

> I’ll push a mix of our patches to master in the next few minutes.

Just saw your patches upsteam, it seems fine!

Thank you,

Mathieu

Re: Update of Emacs to 26.1.

[Alex Kost]

Ricardo Wurmus (2018-05-29 13:32 +0200) wrote:

> Alex Kost <alezost@gmail.com> writes:
>
>> Ricardo Wurmus (2018-05-28 21:25 +0200) wrote:
>>
>> [...]
>>> The update did break “emacs-minimal” and thus all Emacs packages, but
>>> that can be fixed by passing “--with-gnutls=no” to emacs-minimal:
>>
>> I like it!  I think '*-minimal' packages should be as minimal as possible.
>
> “emacs-minimal” already didn’t have gnutls among its inputs, but the
> build system now complains about this unless the configure flags make
> that explicit to show intent.

Oops, sorry, I didn't pay the required attention to the problem you
solved when I wrote that :-)  I just thought that 'emacs-minimal' had
unneeded 'gnutls' input and you removed it.  But now I see, thanks!

-- 
Alex