Skip to content

Commit

Permalink
Fix opencl-mode update and unpin it
Browse files Browse the repository at this point in the history
  • Loading branch information
marienz committed Jun 29, 2024
1 parent aae34d0 commit 96ae6b4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
10 changes: 10 additions & 0 deletions elisp-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
eself,
esuper,
git,
lib,
makeWrapper,
stdenvNoCC,
writeText,
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions fetch-overrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
}

0 comments on commit 96ae6b4

Please sign in to comment.