gnu: emacs-minimal: Ungraft.
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>master
parent
f8364fabbd
commit
cde1176e6f
|
@ -100,15 +100,18 @@
|
|||
(define-public emacs-minimal
|
||||
(package
|
||||
(name "emacs-minimal")
|
||||
(version "29.3")
|
||||
(replacement emacs-minimal/fixed)
|
||||
(version "29.4")
|
||||
;; 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
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/emacs/emacs-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1822swrk4ifmkd4h9l0h37zifcpa1w3sy3vsgyffsrp6mk9hak63"))
|
||||
"0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds"))
|
||||
(patches (search-patches "emacs-disable-jit-compilation.patch"
|
||||
"emacs-exec-path.patch"
|
||||
"emacs-fix-scheme-indent-function.patch"
|
||||
|
@ -335,18 +338,6 @@ languages.")
|
|||
(files '("lib/tree-sitter")))))
|
||||
(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
|
||||
(package/inherit emacs-minimal
|
||||
(name "emacs-no-x")
|
||||
|
|
Reference in New Issue