me/guix
Archived
1
0
Fork 0
Code Activity

gnu: emacs-minimal: Ungraft.

Browse source 
The current graft breaks native compilation and would do so even if reduced to
an ABI hash.  Thus remove it, and rebuild all Emacsen.

* gnu/packages/emacs.scm (emacs-minimal): Update to 29.4.
[replacement]: Remove.  Add note for future replacements.
(emacs-minimal/fixed): Remove variable.

Fixes: Emacs native compilation across grafts <https://bugs.gnu.org/72045>
This commit is contained in:
Liliana Marie Prikler 2024-07-13 07:53:35 +02:00
parent f8364fabbd
commit cde1176e6f
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/emacs.scm
View file

@ -100,15 +100,18 @@
(define-public emacs-minimal (define-public emacs-minimal
(package (package
(name "emacs-minimal") (name "emacs-minimal")
(version "29.3") (version "29.4")
(replacement emacs-minimal/fixed) ;; Note: When using (replacement …), ensure that comp-native-version-dir
;; stays the same across grafts.
;; Run `make check-system TESTS=emacs-native-comp' to ensure that grafts
;; can meaningfully be applied.
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/emacs/emacs-" (uri (string-append "mirror://gnu/emacs/emacs-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1822swrk4ifmkd4h9l0h37zifcpa1w3sy3vsgyffsrp6mk9hak63")) "0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds"))
(patches (search-patches "emacs-disable-jit-compilation.patch" (patches (search-patches "emacs-disable-jit-compilation.patch"
"emacs-exec-path.patch" "emacs-exec-path.patch"
"emacs-fix-scheme-indent-function.patch" "emacs-fix-scheme-indent-function.patch"
@ -335,18 +338,6 @@ languages.")
(files '("lib/tree-sitter"))))) (files '("lib/tree-sitter")))))
(properties `((upstream-name . "emacs"))))) (properties `((upstream-name . "emacs")))))
(define emacs-minimal/fixed
(package
(inherit emacs-minimal)
(version "29.4")
(source
(origin (inherit (package-source emacs-minimal))
(uri (string-append "mirror://gnu/emacs/emacs-"
version ".tar.xz"))
(sha256
(base32
"0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds"))))))
(define-public emacs-no-x (define-public emacs-no-x
(package/inherit emacs-minimal (package/inherit emacs-minimal
(name "emacs-no-x") (name "emacs-no-x")