Hello, Here is a serie to update emacs and the broken dependencies I found, what do you think?
Thanks, Mathieu
>From d81c7664d0064b3d3586b0c8120dc81439bbb093 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe <[email protected]> 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 <[email protected]>: --- 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
>From 7bb48df5ee229ab3e5ab028db92ec0ca927d237b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe <[email protected]> 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
>From d0b615809a33ab59d077576e68c79b415852b4a2 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe <[email protected]> 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
>From 7133b98a9a65cb85c9fb56db9569fd95388c9549 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe <[email protected]> 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
