 ;;; lang/org/packages.el
 
 (package! org
-  :recipe (:host github
-           ;; 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"
+  :recipe (:host nil
+           :repo "https://git.savannah.gnu.org/git/emacs/org-mode.git"
            :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
-           ;;      root. Of course, this command won't work in a sparse clone,
-           ;;      and initiating these compilation step is a hassle, so...
+           ;; HACK Org requires a post-install compilation step to generate a
+           ;;      org-version.el with org-release and org-git-version
+           ;;      functions, using a 'git describe ...' call.  This won't work
+           ;;      in a sparse clone and I value smaller network burdens on
+           ;;      users over non-essential variables so we fake it:
            :build t
            :pre-build
            (with-temp-file "org-version.el"
              (insert "(defun org-release () \"9.5\")\n"
-                     (format "(defun org-git-version (&rest _) \"9.5-%s\")\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 "888aaa97c0ce331097787333d0d712dd6e4d078f")
-(package! org-contrib
-  :recipe (:host nil :repo "https://git.sr.ht/~bzg/org-contrib")
-  :pin "fc81309cf6756607a836f93049a9393c2967c4e0")
+  :pin "cc2490a7061955395c4f5a1a23a088044554a2f7")
+(package! org-contrib :pin "b8012e759bd5bf5da802b0b41734a8fec218323c")
 
 (package! avy)
 (package! htmlize :pin "dd27bc3f26efd728f2b1f01f9e4ac4f61f2ffbf9")

    ;; FIXME A :recipe isn't strictly necessary, but without it, our package
    ;;       bumper fails to distinguish between org-roam v1 and v2.
    :recipe (:host github :repo "org-roam/org-roam")
    :pin "1795039ab93ef19611dbb3fca21c4211c4e655a9")))

;;; Babel
(package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982")

(when (featurep! +hugo)
  (package! ox-hugo
    :recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t)
    :pin "f0357fa7449cc8baecee588dab7dcf9ea243f3b4"))
(when (featurep! :lang rst)
  (package! ox-rst :pin "99fa790da55b57a3f2e9aa187493ba434a64250e"))
