logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from marienz/scala

Browse source 
Fix `:lang scala` with `:lang org`
This commit is contained in:
marienz 2024-05-22 23:57:49 +10:00 • committed by GitHub
commit 23156c4b4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
default.nix
View file

@ -219,7 +219,9 @@ let
recipe = writeText "${name}-generated-recipe" '' recipe = writeText "${name}-generated-recipe" ''
(${name} :fetcher github :repo "marienz/made-up" (${name} :fetcher github :repo "marienz/made-up"
${optionalString (p ? recipe.files) ":files ${p.recipe.files}"})''; ${optionalString (p ? recipe.files) ":files ${p.recipe.files}"})'';
packageRequires = map (name: eself.${name}) reqlist; # TODO: refactor out the recursive call to makePackage.
# (Currently needed for dependencies on packages not in epkgs or doom.)
packageRequires = map (name: eself.${name} or (makePackage name {})) reqlist;
} }
else origEPkg); else origEPkg);
url = url =

7
fetch-overrides.nix
View file

@ -19,7 +19,10 @@
font-lock-ext = "https://github.com/sensorflo/font-lock-ext.git"; font-lock-ext = "https://github.com/sensorflo/font-lock-ext.git";
sln-mode = "https://github.com/sensorflo/sln-mode.git"; sln-mode = "https://github.com/sensorflo/sln-mode.git";
# Straight recipe from emacsmirror-mirror # Straight recipe from emacsmirror-mirror
# (emacsmirror-mirror includes emacsattic, emacs-overlay does not...)
nose = "https://github.com/emacsattic/nose.git"; nose = "https://github.com/emacsattic/nose.git";
ob-ammonite = "https://github.com/emacsattic/ob-ammonite.git";
ammonite-term-repl = "https://github.com/emacsattic/ammonite-term-repl.git";
# In nixpkgs, but uses codeberg, for which nixpkgs uses fetchzip. # In nixpkgs, but uses codeberg, for which nixpkgs uses fetchzip.
# TODO: consider parsing origEPkg.src.url instead. # TODO: consider parsing origEPkg.src.url instead.
tree-sitter-indent = "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git"; tree-sitter-indent = "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git";
@ -32,7 +35,9 @@
# Pins for packages not pinned by Doom and not in nixpkgs or emacs-overlay. # Pins for packages not pinned by Doom and not in nixpkgs or emacs-overlay.
extraPins = { extraPins = {
# Looks stable enough we can get away with pinning it. # Looks stable enough we can get away with pinning it.
"sly-stepper" = "da84e3bba8466c2290c2dc7c27d7f4c48c27b39e"; sly-stepper = "da84e3bba8466c2290c2dc7c27d7f4c48c27b39e";
# In emacsattic, so shouldn't change underneath us.
ammonite-term-repl = "b552fe21977e005c1c460bf6607557e67241a6b6";
}; };
# TODO figure out whether we're better off always setting allRefs. # TODO figure out whether we're better off always setting allRefs.