feat(org): restore org-contrib packages removed upstream

org-contrib is slowly removing packages (most of which have moved or
will move to their own repos or into Org proper).

Ref: emacsmirror/org-contrib@3dd9841522
Ref: emacsmirror/org-contrib@c555d8d489
Ref: emacsmirror/org-contrib@0740bd3fe6
Close: #6740
This commit is contained in:
Ellis Kenyő 2022-09-06 17:06:36 +01:00 committed by Henrik Lissner
parent e9a1908e0d
commit 4d24a3f1a7
3 changed files with 39 additions and 1 deletions

View file

@ -43,6 +43,8 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
** Module flags ** Module flags
- +brain :: - +brain ::
Enable [[https://github.com/Kungsgeten/org-brain][org-brain]] integration. Enable [[https://github.com/Kungsgeten/org-brain][org-brain]] integration.
- +contacts ::
Enable [[https://gitlab.com/aimebertrand/org-mac-link/][org-contacts]] integration.
- +dragndrop :: - +dragndrop ::
Enable drag-and-drop support for images and files; inserts inline previews Enable drag-and-drop support for images and files; inserts inline previews
for images and an icon+link for other media types. for images and an icon+link for other media types.
@ -64,6 +66,8 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
[[doom-module:][:tools pdf]], [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Document-View.html][DocView]], or [[https://github.com/wasamasa/nov.el][nov.el]] to be enabled. [[doom-module:][:tools pdf]], [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Document-View.html][DocView]], or [[https://github.com/wasamasa/nov.el][nov.el]] to be enabled.
- +pandoc :: - +pandoc ::
Enable pandoc integration into the Org exporter. Enable pandoc integration into the Org exporter.
- +passwords ::
Enable [[https://github.com/alfaromurillo/org-passwords.el][org-passwords]] integration.
- +pomodoro :: - +pomodoro ::
Enable a pomodoro timer for clocking time on tasks. Enable a pomodoro timer for clocking time on tasks.
- +present :: - +present ::
@ -93,12 +97,14 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
- [[doom-package:][ob-racket]] if [[doom-package:][:lang racket]] - [[doom-package:][ob-racket]] if [[doom-package:][:lang racket]]
- [[doom-package:][ob-restclient]] if [[doom-package:][:lang rest]] - [[doom-package:][ob-restclient]] if [[doom-package:][:lang rest]]
- [[doom-package:][ob-rust]] if [[doom-package:][:lang rust]] - [[doom-package:][ob-rust]] if [[doom-package:][:lang rust]]
- [[doom-package:][org-contacts]] if [[doom-package:][+contacts]]
- [[doom-package:][org-cliplink]] - [[doom-package:][org-cliplink]]
- [[doom-package:][org-download]] if [[doom-package:][+dragndrop]] - [[doom-package:][org-download]] if [[doom-package:][+dragndrop]]
- [[doom-package:][orgit]] - [[doom-package:][orgit]]
- [[doom-package:][org-noter]] if [[doom-package:][+noter]] - [[doom-package:][org-noter]] if [[doom-package:][+noter]]
- [[doom-package:][org-pdftools]] if [[doom-package:][:tools pdf]] - [[doom-package:][org-pdftools]] if [[doom-package:][:tools pdf]]
- [[doom-package:][org-plus-contrib]] - [[doom-package:][org-plus-contrib]]
- [[doom-package:][org-passwords]] if [[doom-package:][+passwords]]
- [[doom-package:][org-pomodoro]] if [[doom-package:][+pomodoro]] - [[doom-package:][org-pomodoro]] if [[doom-package:][+pomodoro]]
- [[doom-package:][org-roam]] (v1) if [[doom-package:][+roam]] - [[doom-package:][org-roam]] (v1) if [[doom-package:][+roam]]
- [[doom-package:][org-roam]] (v2) if [[doom-package:][+roam2]] - [[doom-package:][org-roam]] (v2) if [[doom-package:][+roam2]]

View file

@ -1060,7 +1060,9 @@ between the two."
"L" #'org-insert-all-links "L" #'org-insert-all-links
"s" #'org-store-link "s" #'org-store-link
"S" #'org-insert-last-stored-link "S" #'org-insert-last-stored-link
"t" #'org-toggle-link-display) "t" #'org-toggle-link-display
(:when (modulep! :os macos)
"g" #'org-mac-link-get-link))
(:prefix ("P" . "publish") (:prefix ("P" . "publish")
"a" #'org-publish-all "a" #'org-publish-all
"f" #'org-publish-current-file "f" #'org-publish-current-file

View file

@ -42,6 +42,24 @@
(package! toc-org :pin "bf2e4b358efbd860ecafe6e74776de0885d9d100") (package! toc-org :pin "bf2e4b358efbd860ecafe6e74776de0885d9d100")
(package! org-cliplink :pin "13e0940b65d22bec34e2de4bc8cba1412a7abfbc") (package! org-cliplink :pin "13e0940b65d22bec34e2de4bc8cba1412a7abfbc")
;; TODO Adjust when this is added to GNU ELPA
(when (modulep! +contacts)
(package! org-contacts
:pin "919511eb86975353eab78842f6b68e65f55fd44d"
:recipe (:host nil
:type git
:repo "https://repo.or.cz/org-contacts.git")))
(when (and IS-MAC
(modulep! :os macos))
(package! org-mac-link :pin "0b18c1d070b9601cc65c40e902169e367e4348c9"))
(when (modulep! +passwords)
(package! org-passwords
:pin "61584aa701defcc0c435d3e7552916235cb655a6"
:recipe (:host github
:repo "alfaromurillo/org-passwords.el")))
(when (modulep! :editor evil +everywhere) (when (modulep! :editor evil +everywhere)
(package! evil-org (package! evil-org
:recipe (:host github :repo "hlissner/evil-org-mode") :recipe (:host github :repo "hlissner/evil-org-mode")
@ -97,6 +115,12 @@
;;; Babel ;;; Babel
(package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982") (package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982")
(when (modulep! :lang clojure)
(package! ob-clojure-literate
:recipe (:type git
:host nil
:repo "https://repo.or.cz/ob-clojure-literate.el.git")
:pin "18c3ea15b872a43e67c899a9914182c35b00b7ee"))
(when (modulep! :lang crystal) (when (modulep! :lang crystal)
(package! ob-crystal :pin "d84c1adee4b269cdba06a97caedb8071561a09af")) (package! ob-crystal :pin "d84c1adee4b269cdba06a97caedb8071561a09af"))
(when (modulep! :lang elixir) (when (modulep! :lang elixir)
@ -113,6 +137,12 @@
(package! ob-hy :pin "a42ecaf440adc03e279afe43ee5ef6093ddd542a")) (package! ob-hy :pin "a42ecaf440adc03e279afe43ee5ef6093ddd542a"))
(when (modulep! :lang nim) (when (modulep! :lang nim)
(package! ob-nim :pin "6fd060a3ecd38be37e4ec2261cd65760a3c35a91")) (package! ob-nim :pin "6fd060a3ecd38be37e4ec2261cd65760a3c35a91"))
(when (modulep! :lang php)
(package! ob-php
:recipe (:type git
:host nil
:repo "https://repo.or.cz/ob-php.git")
:pin "6ebf7799e9ded1d5114094f46785960a50000614"))
(when (modulep! :lang racket) (when (modulep! :lang racket)
(package! ob-racket (package! ob-racket
:recipe (:host github :repo "DEADB17/ob-racket") :recipe (:host github :repo "DEADB17/ob-racket")