amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-next: Update to 30.0.60-1.4e22ef8.

Browse source 
* gnu/packages/aux-files/emacs/comp-integrity-next.el: New file.
* Makefile.am (AUX_FILES): Register it here.
* gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.60-1.4e22ef8.
(emacs->emacs-next)[arguments]: Swap out ‘validate-comp-integrity’ phase,
so as to refer to the new integrity check.
This commit is contained in:
Liliana Marie Prikler 2024-06-30 14:00:05 +02:00
parent 4ac22b897d
commit 74d723b4a8
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
3 changed files with 148 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/emacs.scm
View file

@ -566,12 +566,12 @@ editor (with wide ints)" )
#~(cons "--with-wide-int" #$flags))))))
(define-public emacs-next-minimal
(let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42")
(revision "2"))
(let ((commit "4e22ef870c4b650f29c4441ac51b6a2ac506ea57")
(revision "1"))
(package
(inherit emacs-minimal)
(name "emacs-next-minimal")
(version (git-version "30.0.50" revision commit))
(version (git-version "30.0.60" revision commit))
(source
(origin
(method git-fetch)
@ -580,7 +580,7 @@ editor (with wide ints)" )
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk"))
(base32 "1zl9ffj3ph4msr1r4qw09x1wljpv2lbr7ypqd0p3q89m2qpvfn80"))
(patches
(search-patches "emacs-next-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
@ -598,7 +598,28 @@ editor (with wide ints)" )
(string-drop (package-name emacs)
(string-length "emacs"))))))
(version version)
(source source)))
(source source)
(arguments
(substitute-keyword-arguments (package-arguments emacs)
((#:phases phases)
#~(modify-phases #$phases
(replace 'validate-comp-integrity
(lambda* (#:key outputs #:allow-other-keys)
#$(cond
((%current-target-system)
#~(display
"Cannot validate native compilation on cross builds.\n"))
((member (%current-system) '("armhf-linux" "i686-linux"))
#~(display "Integrity test is broken on 32 bit systems.\n"))
(else
#~(invoke
(string-append (assoc-ref outputs "out") "/bin/emacs")
"--batch"
"--load"
#$(local-file
(search-auxiliary-file
"emacs/comp-integrity-next.el"))
"-f" "ert-run-tests-batch-and-exit")))))))))))
(define-public emacs-next (emacs->emacs-next emacs))
(define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))