Fix opencl-mode update and unpin it
This commit is contained in:
parent
aae34d0dd4
commit
96ae6b4a0d
2 changed files with 10 additions and 5 deletions
|
|
@ -17,6 +17,7 @@
|
||||||
eself,
|
eself,
|
||||||
esuper,
|
esuper,
|
||||||
git,
|
git,
|
||||||
|
lib,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
stdenvNoCC,
|
stdenvNoCC,
|
||||||
writeText,
|
writeText,
|
||||||
|
|
@ -180,6 +181,15 @@
|
||||||
./elisp-patches/helm-taskrunner-version.patch
|
./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,
|
# reveal.js is not actually an ELisp package. Doom gets straight.el to install it,
|
||||||
# then makes org-re-reveal use it as data.
|
# then makes org-re-reveal use it as data.
|
||||||
revealjs = stdenvNoCC.mkDerivation {
|
revealjs = stdenvNoCC.mkDerivation {
|
||||||
|
|
|
||||||
|
|
@ -53,10 +53,5 @@
|
||||||
# making this a non-issue for Doom (since there have been no significant changes to git-commit).
|
# 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.
|
# CI should fail again the next time Doom updates magit, so this won't go stale.
|
||||||
git-commit = "ea0f07e54967197ac0b072a69ba314314a4080c1";
|
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";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue