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

Merge branch 'master' into core-updates

Browse source 
Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/django.scm
	gnu/packages/gtk.scm
	gnu/packages/llvm.scm
	gnu/packages/python-web.scm
	gnu/packages/python.scm
	gnu/packages/tex.scm
	guix/build-system/asdf.scm
	guix/build/emacs-build-system.scm
	guix/profiles.scm
This commit is contained in:
Marius Bakke 2021-05-09 21:29:46 +02:00
commit f034264204
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
305 changed files with 727921 additions and 145425 deletions
Download patch file Download diff file Expand all files Collapse all files

50
gnu/packages/emacs.scm
View file

@ -202,6 +202,31 @@
(car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
"bin/emacs")
#t)))
(add-after 'strip-double-wrap 'wrap-emacs-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lisp-dirs (find-files (string-append out "/share/emacs")
"^lisp$"
#:directories? #t)))
(for-each
(lambda (prog)
(wrap-program prog
;; emacs-next and variants rely on uname being in PATH for
;; Tramp. Tramp paths can't be hardcoded, because they
;; need to be portable.
`("PATH" suffix
,(map (lambda (in) (string-append in "/bin"))
(list (assoc-ref inputs "gzip")
(assoc-ref inputs "coreutils"))))
`("EMACSLOADPATH" suffix ,lisp-dirs)))
(find-files (string-append out "/bin")
;; Matches versioned and unversioned emacs binaries.
;; We don't patch emacsclient, because it takes its
;; environment variables from emacs.
;; Likewise, we don't need to patch helper binaries
;; like etags, ctags or ebrowse.
"^emacs(-[0-9]+(\\.[0-9]+)*)?$"))
#t)))
(add-before 'reset-gzip-timestamps 'make-compressed-files-writable
;; The 'reset-gzip-timestamps phase will throw a permission error
;; if gzip files aren't writable then. This phase is needed when
@ -214,6 +239,10 @@
`(("gnutls" ,gnutls)
("ncurses" ,ncurses)
;; Required for "core" functionality, such as dired and compression.
("coreutils" ,coreutils)
("gzip" ,gzip)
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
;; only via insecure channels. This is not needed for (modern) IMAP.
("mailutils" ,mailutils)
@ -261,9 +290,7 @@
(native-search-paths
(list (search-path-specification
(variable "EMACSLOADPATH")
;; The versioned entry is for the Emacs' builtin libraries.
(files (list "share/emacs/site-lisp"
(string-append "share/emacs/" version "/lisp"))))
(files '("share/emacs/site-lisp")))
(search-path-specification
(variable "INFOPATH")
(files '("share/info")))))
@ -300,18 +327,7 @@ languages.")
"0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3"))))
(native-inputs
`(("autoconf" ,autoconf)
,@(package-native-inputs emacs)))
(native-search-paths
(list (search-path-specification
(variable "EMACSLOADPATH")
;; The versioned entry is for the Emacs' builtin libraries.
(files (list "share/emacs/site-lisp"
(string-append "share/emacs/"
(version-major+minor+point version)
"/lisp"))))
(search-path-specification
(variable "INFOPATH")
(files '("share/info"))))))))
,@(package-native-inputs emacs))))))
(define-public emacs-next-pgtk
(let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2")
@ -362,7 +378,9 @@ also enabled and works without glitches even on X server."))))
(delete 'strip-double-wrap)))))
(inputs
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
("ncurses" ,ncurses)))
("ncurses" ,ncurses)
("coreutils" ,coreutils)
("gzip" ,gzip)))
(native-inputs
`(("pkg-config" ,pkg-config)))))