emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bump: :lang org

Browse source 
emacs-straight/org-mode@1b2d06880f -> emacs-straight/org-mode@d4e1925147
org-roam/org-roam@1b221a1d4a -> org-roam/org-roam@c789531e36

- An unguarded native-comp-available-p call was fixed upstream (in org),
  which caused void-function errors for non-native-comp users (#5706).
- org-version.el is now generated with the correct version, so we don't
  have to update it ourselves.

Fix: #5706
This commit is contained in:
Henrik Lissner 2021-11-01 02:12:24 +01:00
parent 6d5d0345cc
commit 935ed860a1
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/lang/org/packages.el
View file

@ -17,11 +17,17 @@
:build t :build t
:pre-build :pre-build
(with-temp-file "org-version.el" (with-temp-file "org-version.el"
(insert "(defun org-release () \"9.5\")\n" (let ((version
(format "(defun org-git-version (&rest _) \"9.5-??-%s\")\n" (with-temp-buffer
(cdr (doom-call-process "git" "rev-parse" "--short" "HEAD"))) (insert-file-contents (doom-path "lisp/org.el") nil 0 1024)
"(provide 'org-version)\n"))) (if (re-search-forward "^;; Version: \\([^\n-]+\\)" nil t)
:pin "1b2d06880f03c4e2063a9c91741935ea49144d2c") (match-string-no-properties 1)
"Unknown"))))
(insert (format "(defun org-release () %S)\n" version)
(format "(defun org-git-version (&rest _) \"%S-??-%s\")\n"
version (cdr (doom-call-process "git" "rev-parse" "--short" "HEAD")))
"(provide 'org-version)\n"))))
:pin "d4e192514769368e32c4e61629bf51e67a781bff")
(package! org-contrib :pin "56a3bbbd486c567234e63c95c954c5e2ed77f8e7") (package! org-contrib :pin "56a3bbbd486c567234e63c95c954c5e2ed77f8e7")
(package! avy) (package! avy)
@ -84,7 +90,7 @@
;; FIXME A :recipe isn't strictly necessary, but without it, our package ;; FIXME A :recipe isn't strictly necessary, but without it, our package
;; bumper fails to distinguish between org-roam v1 and v2. ;; bumper fails to distinguish between org-roam v1 and v2.
:recipe (:host github :repo "org-roam/org-roam") :recipe (:host github :repo "org-roam/org-roam")
:pin "1b221a1d4ad0edae746a7eae435f4c3bca56c10e"))) :pin "c789531e368f440f554601790747f10003d1796b")))
;;; Babel ;;; Babel
(package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982") (package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982")