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

Make extraPins override Doom pins

Browse source 
So it can be used to override conflicting pins for packages built from
the same repo.
This commit is contained in:
Marien Zwart 2024-06-22 21:54:11 +10:00
parent 5d98aba1a2
commit 5e2835bffe
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
default.nix
View file

@ -104,7 +104,7 @@ let
repoToPackages = lib.zipAttrs repoToPackages = lib.zipAttrs
(lib.mapAttrsToList (name: repo: { ${repo} = name; }) packageToRepo); (lib.mapAttrsToList (name: repo: { ${repo} = name; }) packageToRepo);
packageToPin = lib.mapAttrs packageToPin = lib.mapAttrs
(name: p: p.pin or extraPins.${name} or null) doomPackageSet; (name: p: extraPins.${name} or p.pin or null) doomPackageSet;
repoToPins = lib.mapAttrs (name: packages: repoToPins = lib.mapAttrs (name: packages:
lib.unique (lib.filter (p: p != null) (map (p: packageToPin.${p}) packages))) lib.unique (lib.filter (p: p != null) (map (p: packageToPin.${p}) packages)))
repoToPackages; repoToPackages;
@ -154,7 +154,7 @@ let
# null`, we need to explicitly check for presence. # null`, we need to explicitly check for presence.
hasOrigEPkg = esuper ? ${name}; hasOrigEPkg = esuper ? ${name};
origEPkg = esuper.${name}; origEPkg = esuper.${name};
pin = p.pin or extraPins.${name} or ( pin = extraPins.${name} or p.pin or (
# Don't use `url`: this needs to be in sync with repoToPin above. # Don't use `url`: this needs to be in sync with repoToPin above.
# (If we remap ELPA packages to emacs-straight here but not above, it breaks...) # (If we remap ELPA packages to emacs-straight here but not above, it breaks...)
let repo = esuper.${name}.src.gitRepoUrl or null; in let repo = esuper.${name}.src.gitRepoUrl or null; in