From 55f99b5eb73376938c6873085258f9204eab119c Mon Sep 17 00:00:00 2001
From: Marien Zwart <marien.zwart@gmail.com>
Date: Sat, 30 Mar 2024 21:04:14 +1100
Subject: [PATCH] Drop obsolete patch

Doom updated to a version including this.
---
 elisp-packages.nix                      | 10 +---
 org-contrib-ob-stata-ess-optional.patch | 66 -------------------------
 2 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 org-contrib-ob-stata-ess-optional.patch

diff --git a/elisp-packages.nix b/elisp-packages.nix
index ef9fa20..f54cb92 100644
--- a/elisp-packages.nix
+++ b/elisp-packages.nix
@@ -74,15 +74,7 @@
     meta = {
       description = "build org-contrib from emacsmirror for Doom";
     };
-    # Apply upstream fix for hard dependency on ess-custom.
-    # Straight just seems to ignore the byte-compilation failure(?).
-    patches = [ ./org-contrib-ob-stata-ess-optional.patch ];
-    # HACK around sources being in lisp/, which trivialBuild does not
-    # handle. Setting sourceDir would probably be more sane, but we
-    # need the original one for a patch to apply.
-    postPatch = ''
-      cd lisp
-    '';
+    sourceRoot = "source/lisp";
   };
   sln-mode = esuper.trivialBuild {
     pname = "sln-mode";
diff --git a/org-contrib-ob-stata-ess-optional.patch b/org-contrib-ob-stata-ess-optional.patch
deleted file mode 100644
index b8f25cf..0000000
--- a/org-contrib-ob-stata-ess-optional.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b2c5460598c7d91a66bd87ab9b6e9c0c442c9210 Mon Sep 17 00:00:00 2001
-From: Ihor Radchenko <yantar92@posteo.net>
-Date: Sat, 13 Jan 2024 12:45:46 +0100
-Subject: [PATCH] lisp/ob-stata.el: Keep ESS optional to pacify compiler
-
-* lisp/ob-stata.el (ess-custom): Remove require.  We cannot declare
-ESS in common org-contrib dependencies.
-(org-babel-stata-command): Change default value to nil, setting it to
-`org-babel-stata-command' only after 'ess-custom is loaded.
-(org-babel-stata-evaluate-external-process): Demand ess-custom during
-runtime.
-(ess-eval-visibly-p): Add variable declaration.
----
- lisp/ob-stata.el | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/lisp/ob-stata.el b/lisp/ob-stata.el
-index b7568e2..5956d2f 100644
---- a/lisp/ob-stata.el
-+++ b/lisp/ob-stata.el
-@@ -42,7 +42,6 @@
- ;;; Code:
- (require 'ob)
- (require 'cl-lib)
--(require 'ess-custom) ; for `inferior-STA-program'
- 
- (declare-function orgtbl-to-csv "org-table" (table params))
- (declare-function stata "ext:ess-stata" (&optional start-args))
-@@ -67,12 +66,20 @@
- ;; only ':results output' currently works, so make that the default
- (defvar org-babel-default-header-args:stata '((:results . "output")))
- 
--(defcustom org-babel-stata-command inferior-STA-program
-+(defcustom org-babel-stata-command nil
-   "Name of command to use for executing stata code."
-   :group 'org-babel
-   :version "24.4"
-   :package-version '(Org . "8.3")
-   :type 'string)
-+;; FIXME: Arrange the default value to be set without byte-compiler
-+;; complaining.  A proper fix would be putting this file into a
-+;; separate package and adding ESS to package requires. Not possible
-+;; while it is a part of org-contrib.
-+(defvar inferior-STA-program)
-+(eval-after-load 'ess-custom
-+  (unless org-babel-stata-command
-+    (setq org-babel-stata-command inferior-STA-program)))
- 
- (defvar ess-local-process-name) ; dynamically scoped
- (defun org-babel-edit-prep:stata (info)
-@@ -242,6 +249,7 @@ current code buffer."
- If RESULT-TYPE equals \\='output then return standard output as a
- string.  If RESULT-TYPE equals \\='value then return the value of the
- last statement in BODY, as elisp."
-+  (require 'ess-custom)
-   (cl-case result-type
-     (value
-      (let ((tmp-file (org-babel-temp-file "stata-")))
-@@ -258,6 +266,7 @@ last statement in BODY, as elisp."
- 	column-names-p)))
-     (output (org-babel-eval org-babel-stata-command body))))
- 
-+(defvar ess-eval-visibly-p)
- (defun org-babel-stata-evaluate-session
-     (session body result-type result-params column-names-p _row-names-p)
-   "Evaluate BODY in SESSION.