From 9811756e801e0ab369bf1de82b288ea884790420 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 18 Jul 2021 02:16:00 -0400 Subject: [PATCH] Bump :lang org Kungsgeten/org-brain@e9b9b3e -> Kungsgeten/org-brain@46ca9f7 Lompik/ob-nim@bf1642c -> Lompik/ob-nim@6fd060a astahlman/ob-async@de1cd6c -> astahlman/ob-async@9aac486 bastibe/org-journal@043bb9e -> bastibe/org-journal@6c3a2fd emacs-straight/org-mode@7a62a4d -> emacs-straight/org@b83ae59 emacsorphanage/gnuplot@116cad8 -> emacsorphanage/gnuplot@7138b13 hakimel/reveal.js@cf8e64b -> hakimel/reveal.js@b18f12d harrybournis/org-fancy-priorities@819bb99 -> harrybournis/org-fancy-priorities@44532ab jkitchin/ox-clip@2095537 -> jkitchin/ox-clip@05a14d5 kaushalmodi/ox-hugo@02140a2 -> kaushalmodi/ox-hugo@290b5d6 magit/orgit-forge@ea2a1cf -> magit/orgit-forge@365b756 magit/orgit@609fd0c -> magit/orgit@f956d80 oer/org-re-reveal@18a2456 -> oer/org-re-reveal@cf00089 org-roam/org-roam@8ad57b1 -> org-roam/org-roam@756f621 Note: org-roam/org-roam@756f621 is the last v1 commit, and should be frozen from this point onward (a +roam2 flag will be introduced soon). --- modules/lang/org/packages.el | 64 +++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index 9ba1deabb..5da2374f5 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -1,37 +1,38 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/org/packages.el -(package! org-mode +(package! org :recipe (:host github - ;; Install cutting-edge version of org-mode, and from a mirror, - ;; because code.orgmode.org runs on a potato. - :repo "emacs-straight/org-mode" - :files ("*.el" "lisp/*.el" "contrib/lisp/*.el" "contrib/scripts") + ;; Install cutting-edge version of org, and from a mirror because + ;; code.orgmode.org's uptime is worse than Github's, and + ;; emacs-straight/org is smaller and, therefore, quicker to download. + :repo "emacs-straight/org" + :files (:defaults "etc") ;; HACK A necessary hack because org requires a compilation step ;; after being cloned, and during that compilation a ;; org-version.el is generated with these two functions, which - ;; return the output of a 'git describe ...' call in the repo's + ;; return the output of a 'git describe ...' call in the repo's ;; root. Of course, this command won't work in a sparse clone, - ;; and more than that, initiating these compilation step is a - ;; hassle, so... + ;; and initiating these compilation step is a hassle, so... + :build t :pre-build - (with-temp-file (doom-path (straight--repos-dir "org-mode") "org-version.el") - (insert "(fset 'org-release (lambda () \"9.5\"))\n" - "(fset 'org-git-version #'ignore)\n" - "(provide 'org-version)\n")) - ;; Prevents built-in Org from sneaking into the byte-compilation of - ;; `org-plus-contrib', and inform other packages that `org-mode' - ;; satisfies the `org' dependency: raxod502/straight.el#352 - :includes (org org-plus-contrib)) - :pin "7a62a4d3251a512069aa06b0082529d61d22de26") + (with-temp-file "org-version.el" + (insert "(defun org-release () \"9.5\")\n" + (format "(defun org-git-version (&rest _) \"9.5-%s\")\n" + (cdr (doom-call-process "git" "rev-parse" "--short" "HEAD"))) + "(provide 'org-version)\n"))) + :pin "b83ae593473810354504f0f182bfba4537d3c284") +(package! org-contrib + :recipe (:host nil :repo "https://git.sr.ht/~bzg/org-contrib") + :pin "fc81309cf6756607a836f93049a9393c2967c4e0") (package! avy) (package! htmlize :pin "49205105898ba8993b5253beec55d8bddd820a70") (package! org-yt :recipe (:host github :repo "TobiasZawada/org-yt") :pin "40cc1ac76d741055cbefa13860d9f070a7ade001") -(package! ox-clip :pin "2095537695135c7f1bc19db043925eb7d482907b") -(package! toc-org :pin "c4c61c5a382f94a3a4537e254243006dec2dcca4") +(package! ox-clip :pin "05a14d56bbffe569d86f20b49ae31ed2ac7d1101") +(package! toc-org :pin "df4ad6ff15e3b02f6322305638a441a636b9b37e") (package! org-cliplink :pin "13e0940b65d22bec34e2de4bc8cba1412a7abfbc") (when (featurep! :editor evil +everywhere) @@ -41,44 +42,45 @@ (when (featurep! :tools pdf) (package! org-pdftools :pin "a5b61bca3f8c91b0859bb0df1a929f9a31a57b99")) (when (featurep! :tools magit) - (package! orgit :pin "609fd0ccfb5268704b5bc7d7ac1014d4960b9707") + (package! orgit :pin "f956d802f19ea495efa95af6c673588afeb3adc5") (when (featurep! :tools magit +forge) - (package! orgit-forge :pin "ea2a1cf9d337901b413e9df258b8e07af55c00f6"))) + (package! orgit-forge :pin "365b75609a9454dccf5681eb6075ca53bd32af85"))) (when (featurep! +brain) - (package! org-brain :pin "e9b9b3e5bb3c63cecb1367df49205c346d9c050a")) + (package! org-brain :pin "46ca9f766322cff31279ecdf02251ff24a0e9431")) (when (featurep! +dragndrop) (package! org-download :pin "947ca223643d28e189480e607df68449c15786cb")) (when (featurep! +gnuplot) - (package! gnuplot :pin "116cad8e09024223f97e81b0a4503cef20de9bf5") + (package! gnuplot :pin "7138b139d2dca9683f1a81325c643b2744aa1ea3") (package! gnuplot-mode :pin "601f6392986f0cba332c87678d31ae0d0a496ce7")) (when (featurep! +ipython) ; DEPRECATED (package! ob-ipython :pin "7147455230841744fb5b95dcbe03320313a77124")) (when (featurep! +jupyter) (package! jupyter :pin "1f0612eb936d36abab0f27b09cca691e81fc6e74")) (when (featurep! +journal) - (package! org-journal :pin "043bb9e26f75066dc1787cdc9265daca7a14dd4e")) + (package! org-journal :pin "6c3a2fdb6c85253a32992a29edb976407bad4d77")) (when (featurep! +noter) (package! org-noter :pin "9ead81d42dd4dd5074782d239b2efddf9b8b7b3d")) (when (featurep! +pomodoro) (package! org-pomodoro :pin "aa07c11318f91219336197e62c47bc7a3d090479")) (when (featurep! +pretty) + (package! org-appear :pin "148aa124901ae598f69320e3dcada6325cdc2cf0") (package! org-superstar :pin "9d64c42e5029910153ec74cb9b5747b074281140") - (package! org-fancy-priorities :pin "819bb993b71e7253cefef7047306ab4e0f9d0a86")) + (package! org-fancy-priorities :pin "44532ab8c25eb2c0028eecca7acd9e8ea8e2ff30")) (when (featurep! +present) (package! centered-window :recipe (:host github :repo "anler/centered-window-mode") :pin "f50859941ab5c7cbeaee410f2d38716252b552ac") (package! org-tree-slide :pin "9d2ba1df456d8d7c6372c8c294dbe3ee81540b33") - (package! org-re-reveal :pin "18a2456befcfda5f681b2b4041f3262f93e52cba") + (package! org-re-reveal :pin "cf000894f6e5d0627151e2bec5b1a54a311ad53e") (package! revealjs :recipe (:host github :repo "hakimel/reveal.js" :files ("css" "dist" "js" "plugin")) - :pin "cf8e64bd8504737912b39e4153390cffbf443ed7")) + :pin "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad")) (when (featurep! +roam) - (package! org-roam :pin "8ad57b121831eda8d226faa14ff2ba7ab652849c")) + (package! org-roam :pin "756f6215b672e267f986a3d6e494f5309825b91a")) ;;; Babel -(package! ob-async :pin "de1cd6c93242a4cb8773bbe115b7be3d4dd6b97e") +(package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982") (when (featurep! :lang crystal) (package! ob-crystal :pin "d84c1adee4b269cdba06a97caedb8071561a09af")) (when (featurep! :lang elixir) @@ -88,7 +90,7 @@ (when (featurep! :lang hy) (package! ob-hy :pin "a42ecaf440adc03e279afe43ee5ef6093ddd542a")) (when (featurep! :lang nim) - (package! ob-nim :pin "bf1642cb93f0a898804dc13fd9408d2964403bd2")) + (package! ob-nim :pin "6fd060a3ecd38be37e4ec2261cd65760a3c35a91")) (when (featurep! :lang racket) (package! ob-racket :recipe (:host github :repo "DEADB17/ob-racket") @@ -104,6 +106,6 @@ (when (featurep! +hugo) (package! ox-hugo :recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t) - :pin "02140a294a8d0d15ca42a1956af794fd7ec18140")) + :pin "290b5d6b659addf99cb96a316fb24caa90ad0e77")) (when (featurep! :lang rst) (package! ox-rst :pin "99fa790da55b57a3f2e9aa187493ba434a64250e"))