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

Fix conflicting pins of magit and git-commit

Browse source 
62248f8366
updates magit without updating git-commit, which is built from the same
repo.

Pin git-commit to the same newer version (no significant changes).
This commit is contained in:
Marien Zwart 2024-06-22 21:32:01 +10:00
parent 13e64824f4
commit 5533ae9a36
No known key found for this signature in database
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fetch-overrides.nix
View file

@ -42,5 +42,11 @@
sly-stepper = "da84e3bba8466c2290c2dc7c27d7f4c48c27b39e"; sly-stepper = "da84e3bba8466c2290c2dc7c27d7f4c48c27b39e";
# In emacsattic, so shouldn't change underneath us. # In emacsattic, so shouldn't change underneath us.
ammonite-term-repl = "b552fe21977e005c1c460bf6607557e67241a6b6"; ammonite-term-repl = "b552fe21977e005c1c460bf6607557e67241a6b6";
# Temporarily override git-commit, which Doom pins to an earlier commit than magit
# (built from the same repo). When building with straight, the magit pin seems to "win",
# 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.
git-commit = "ea0f07e54967197ac0b072a69ba314314a4080c1";
}; };
} }