From 96ae6b4a0d0664056ed0d2c998fa2d5d33225643 Mon Sep 17 00:00:00 2001
From: Marien Zwart <marien.zwart@gmail.com>
Date: Sat, 29 Jun 2024 18:18:23 +1000
Subject: [PATCH] Fix opencl-mode update and unpin it

---
 elisp-packages.nix  | 10 ++++++++++
 fetch-overrides.nix |  5 -----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/elisp-packages.nix b/elisp-packages.nix
index f89eed6..b5453e8 100644
--- a/elisp-packages.nix
+++ b/elisp-packages.nix
@@ -17,6 +17,7 @@
   eself,
   esuper,
   git,
+  lib,
   makeWrapper,
   stdenvNoCC,
   writeText,
@@ -180,6 +181,15 @@
       ./elisp-patches/helm-taskrunner-version.patch
     ];
   };
+  # Upstream renamed from opencl-mode to opencl-c-mode. melpa2nix requires single-file-package file
+  # names match the package name. So rename the package (not the file, just in case someone loads it
+  # explicitly).
+  opencl-mode = esuper.opencl-mode.overrideAttrs (attrs: {
+    ename = "opencl-c-mode";
+    recipe = writeText "opencl-c-mode-recipe" (
+      lib.replaceStrings ["(opencl-mode"] ["(opencl-c-mode"] (
+        lib.readFile attrs.recipe));
+  });
   # reveal.js is not actually an ELisp package. Doom gets straight.el to install it,
   # then makes org-re-reveal use it as data.
   revealjs = stdenvNoCC.mkDerivation {
diff --git a/fetch-overrides.nix b/fetch-overrides.nix
index b11a8f5..6da2a83 100644
--- a/fetch-overrides.nix
+++ b/fetch-overrides.nix
@@ -53,10 +53,5 @@
     # 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";
   };
 }