Merge pull request #17 from marienz/manual-flake-update

Update Doom

default.nix

@@ -237,8 +237,8 @@ let
                       && p ? recipe.repo
                       && (p.recipe.host or null) == null
               then p.recipe.repo
-              else epkg.src.gitRepoUrl
-                or extraUrls.${name}
+              else extraUrls.${name}
+                or epkg.src.gitRepoUrl
                 or (if isElpa then "https://github.com/emacs-straight/${name}"
                     else (let
                       recipe = lib.generators.toPretty {} (p.recipe or "missing");

elisp-packages.nix

@@ -162,12 +162,6 @@
       done
     '';
   };
-  # Fix /build/ leaking into byte-compiled files (patch accepted upstream).
-  phpactor = esuper.phpactor.overrideAttrs (attrs: {
-    patches = (attrs.patches or [ ]) ++ [
-      ./elisp-patches/0001-Do-not-call-locate-user-emacs-file-when-compiling.patch
-    ];
-  });
   # https://github.com/emacs-taskrunner/helm-taskrunner/issues/2
   # TODO: make our generated melpaBuild available in esuper?
   # (upstream unchanged for 5 years, not urgent to make this robust...)

elisp-patches/0001-Do-not-call-locate-user-emacs-file-when-compiling.patch

@@ -1,29 +0,0 @@
-From 9d0a3eb98982c38bfe1e1872498538b103ad06cd Mon Sep 17 00:00:00 2001
-From: Marien Zwart <marienz@google.com>
-Date: Sun, 7 Apr 2024 17:46:36 +1000
-Subject: [PATCH] Do not call locate-user-emacs-file when compiling
-
-The default value of phpactor-install-directory is relative to the
-user's user-emacs-directory. Using eval-when-compile here hardcodes the
-wrong directory if a separate build user is used.
----
- phpactor.el | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/phpactor.el b/phpactor.el
-index 7e7c036..96de425 100644
---- a/phpactor.el
-+++ b/phpactor.el
-@@ -68,8 +68,7 @@
- 
- ;;;###autoload
- (defcustom phpactor-install-directory
--  (eval-when-compile
--    (expand-file-name (locate-user-emacs-file "phpactor/")))
-+  (expand-file-name (locate-user-emacs-file "phpactor/"))
-   "Directory for setup Phactor.  (default `~/.emacs.d/phpactor/')."
-   :type 'directory)
- 
--- 
-2.42.0
-

fetch-overrides.nix

@@ -53,5 +53,10 @@
     # making this a non-issue for Doom (since there have been no significant changes to git-commit).
     # CI should fail again the next time Doom updates magit, so this won't go stale.
     git-commit = "ea0f07e54967197ac0b072a69ba314314a4080c1";
+
+    # Temporarily pin opencl-mode. It renamed to opencl-c-mode, which triggers a build failure:
+    #
+    # error("%s" "Single file opencl-c-mode.el does not match package name opencl-mode")
+    opencl-mode = "15091eff92c33ee0d1ece40eb99299ef79fee92d";
   };
 }

flake.lock

@@ -3,11 +3,11 @@
     "doomemacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1719177351,
-        "narHash": "sha256-7NwEb9wMIDm/tF1PBkt1+fN5z23jDDgwyiHfdOvidug=",
+        "lastModified": 1719458466,
+        "narHash": "sha256-R4v38GEEOhgp56xq6jG35s52fpjsggoiA77Q7pz4/RI=",
         "owner": "doomemacs",
         "repo": "doomemacs",
-        "rev": "a99c6b9036bde2f60697ce9f2ac259dfa2266dbf",
+        "rev": "a24ff58a5afea0f2ba1bab85cc39f5c49a688e97",
         "type": "github"
       },
       "original": {