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

Deal with agda2-mode / agda-input merge

Browse source 
agda2-mode and agda-input live in the same upstream repository. Doom
handles these as separate packages (with recipes installing
agda-input.el as agda-input and everything else as agda2-mode), but
nixpkgs has just agda2-mode, with installing agda-input now triggering
an explicit error.

Work around this by by filtering out agda-input from doomPackageSet, so
we do not attempt to build/install it.

We generate packages.el one step earlier, but we want an `:ignore t`
package in there, which we also write for packages we actually install.
So this should work correctly.

Although agda-input is available as a separate package in nixpkgs 24.05,
its agda2-mode package already installs agda-input.el too. So this
change should be correct there too, even though it is not (yet)
required.

Adding a placeholder agda-input package to our elisp-packages.nix does
not work, because our repoToPins logic accesses `esuper.${name}`,
triggering the new build error.
This commit is contained in:
Marien Zwart 2024-07-20 13:53:40 +10:00
parent b993c85c37
commit cfd755015c
No known key found for this signature in database
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
default.nix
View file

@ -80,7 +80,10 @@ let
scriptArgs = "-o $out"; scriptArgs = "-o $out";
}; };
doomPackageSet = lib.importJSON "${doomIntermediates}/packages.json"; # Ignore agda-input: nixpkgs installs this as part of agda2-mode.
doomPackageSet = lib.filterAttrs
(n: v: n != "agda-input")
(lib.importJSON "${doomIntermediates}/packages.json");
# Step 2: override Emacs packages to respect Doom's pins. # Step 2: override Emacs packages to respect Doom's pins.
doomEmacsPackages = (emacsPackagesFor emacs).overrideScope ( doomEmacsPackages = (emacsPackagesFor emacs).overrideScope (