Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix :lang scala with :lang org #5

Merged
merged 2 commits into from
May 22, 2024
Merged

Fix :lang scala with :lang org #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83302a4
Add two more emacsattic packages (used by scala)
marienz May 22, 2024
4cf47c2
Fix dependencies on unknown packages
marienz May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,9 @@ let
recipe = writeText "${name}-generated-recipe" ''
(${name} :fetcher github :repo "marienz/made-up"
${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);
url =
Expand Down
7 changes: 6 additions & 1 deletion fetch-overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
font-lock-ext = "https://github.com/sensorflo/font-lock-ext.git";
sln-mode = "https://github.com/sensorflo/sln-mode.git";
# Straight recipe from emacsmirror-mirror
# (emacsmirror-mirror includes emacsattic, emacs-overlay does not...)
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.
# TODO: consider parsing origEPkg.src.url instead.
tree-sitter-indent = "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git";
Expand All @@ -32,7 +35,9 @@
# Pins for packages not pinned by Doom and not in nixpkgs or emacs-overlay.
extraPins = {
# 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.
Expand Down